New release 1.7.0

7 files changed, 2505 insertions, 0 deletions

diff --git a/namedc/Jamfile b/namedc/Jamfile
new file mode 100644
index 0000000..62d4c7e
--- /dev/null
+++ b/namedc/Jamfile
@@ -0,0 +1,21 @@
+
+# Jamfile for namedc library
+ 
+#PREF_CCFLAGS 	= $(CCOPTFLAG) ;		# Turn optimisation on
+PREF_CCFLAGS	= $(CCDEBUGFLAG) ;		# Debugging flags
+PREF_LINKFLAGS	= $(LINKDEBUGFLAG) ;
+
+HDRS = ../h ../icc ../cgats ../numlib ../xicc ../spectro ../xml ; 
+
+# mXML library
+Library libnamedc : namedc.c ;
+
+LINKLIBS = ./libnamedc ../xicc/libxicc ../spectro/libconv ../icc/libicc ../cgats/libcgats
+           ../plot/libplot ../numlib/libui ../numlib/libnum ../xml/libmxml ;
+
+# Individual stand alone test of namedc
+MainVariant namedc : namedc.c : : STANDALONE_TEST ;
+
+# Conversion utility
+Main txt2iccnc : txt2iccnc.c ;
+
diff --git a/namedc/License.txt b/namedc/License.txt
new file mode 100644
index 0000000..a871fcf
--- /dev/null
+++ b/namedc/License.txt
@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are 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.
+
+  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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state 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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
+
diff --git a/namedc/Readme.txt b/namedc/Readme.txt
new file mode 100644
index 0000000..4cd0c37
--- /dev/null
+++ b/namedc/Readme.txt
@@ -0,0 +1 @@
+Library for loading named color files of varoius types.
diff --git a/namedc/afiles b/namedc/afiles
new file mode 100644
index 0000000..cd1bf61
--- /dev/null
+++ b/namedc/afiles
@@ -0,0 +1,7 @@
+afiles
+Readme.txt
+License.txt
+Jamfile
+namedc.c
+namedc.h
+txt2iccnc.c
diff --git a/namedc/namedc.c b/namedc/namedc.c
new file mode 100644
index 0000000..d1dece9
--- /dev/null
+++ b/namedc/namedc.c
@@ -0,0 +1,1385 @@
+
+/* 
+ * Argyll Color Correction System
+ * Named Color Access Library
+ *
+ * Author: Graeme W. Gill
+ * Date:   3/12/2013
+ *
+ * Copyright 2013 Graeme W. Gill
+ * All rights reserved.
+ *
+ * This material is licenced under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3 :-
+ * see the License.txt file for licencing details.
+ */
+
+/*
+ * Currently supports CxF2, CxF3 & ICC names color profiles.
+ */
+
+/*
+ * TTBD:
+ *
+ * Probably want to add some other formst:
+ * (see <http://www.selapa.net/swatchbooker/>
+ *  and <http://www.selapa.net/swatches/colors/fileformats.php>  )
+ *
+ * 	Adobe .aco
+ * 	      .acb
+ * 	      .acbl
+ * 	      .ase
+ * 	      .bcf
+ * corel  .cpl
+ * corel  .xml
+ * autocad .acb			RGB only 
+ *
+ * and lower quality RGB formats:
+ *
+ * Adobe  .acf		?? May support Lab
+ * corel  .acb
+ *
+ * Paint Shop Pro .pal ???
+ *
+ * RAL ?
+ */
+
+#undef DEBUG
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <sys/types.h>
+#include <time.h>
+#include "copyright.h"
+#include "aconfig.h"
+#ifndef SALONEINSTLIB
+#include "numlib.h"
+#include "icc.h"
+#else
+#include "numsup.h"
+#endif
+#include "conv.h"
+#include "cgats.h"
+#include "xspect.h"
+#include "mxml.h"
+#include "namedc.h"
+#ifdef STANDALONE_TEST
+#include "ui.h"
+#endif /* STANDALONE_TEST */
+
+#ifndef STANDALONE_TEST
+
+# define DEB6 6
+# define DEB4 4
+
+#ifdef NT       /* You'd think there might be some standards.... */
+# ifndef __BORLANDC__
+#  define stricmp _stricmp
+# endif
+#else
+# define stricmp strcasecmp
+#endif
+
+/* Forward declarations */
+static void clear_namedc(namedc *p);
+static void clear_nce(nce *p);
+
+static ORD32 do_hash(ORD32 hash, const char *s) {
+	int i;
+    for (i = 0; s[i] != '\000'; i++) {
+        hash += s[i];
+        hash += (hash << 10);
+        hash ^= (hash >> 6);
+    }
+    return hash;
+}
+
+static int do_hash2(const char *s1, const char *s2) {
+	ORD32 hash;
+
+	hash = do_hash(0, s1);
+	hash = do_hash(hash, s2);
+
+	return (int)hash;
+}
+
+/* Compare while ignoring possible prefix on s1 */
+static int pfxcmp(const char *s1, const char *s2) {
+	const char *cp;
+
+	if ((cp = strchr(s1, ':')) == NULL)
+		cp = s1;
+	else
+		cp++;
+
+	return strcmp(cp, s2);
+}
+
+/* XML data type callback for mxmlLoadFile() */
+mxml_type_t
+type_cb(mxml_node_t *node) {
+	mxml_node_t *parent = mxmlGetParent(node);
+	const char *pname;
+	const char *name = node->value.element.name;
+
+	if (parent == NULL)
+		return MXML_TEXT;
+
+	pname = parent->value.element.name;
+
+//	printf("~1 type_cb got node named '%s'\n",name);
+
+	if ((pfxcmp(pname, "ColorCIELab") == 0
+	  || pfxcmp(pname, "ColorSpaceCIELab") == 0)
+	 && (pfxcmp(name, "L") == 0
+	  || pfxcmp(name, "A") == 0
+	  || pfxcmp(name, "B") == 0))
+		return MXML_REAL;
+
+	if ((pfxcmp(pname, "ColorCIEXYZ") == 0
+	  || pfxcmp(pname, "ColorSpaceCIEXYZ") == 0)
+	 && (pfxcmp(name, "X") == 0
+	  || pfxcmp(name, "Y") == 0
+	  || pfxcmp(name, "Z") == 0))
+		return MXML_REAL;
+
+	// ReflectanceSpectrum
+	// Example doesn't have NumPoints, Increment
+	// <ReflectanceSpectrum MeasureDate="2003-09-28T12:15:33-05:00"_ColorSpecification="CSD65-2" Name="45/0 Spectral" StartWL="400" NumPoints="31" Increment="10">
+	// 0.0580 0.0594 0.0594 0.0584 0.0581 0.0591 0.0599 0.0601 0.0603 0.0610 0.0634 0.0695 0.0760 0.0786 0.0798 0.0826 0.0897 0.1024 0.1197 0.1350 0.1434 0.1455 0.1499 0.1594 0.1721 0.1842 0.1913 0.1928 0.1878 0.1734 0.1704
+
+	if ((pfxcmp(pname, "ColorSRGB") == 0
+	  || pfxcmp(pname, "ColorSpaceSRGB") == 0)
+	 && (pfxcmp(name, "R") == 0
+	  || pfxcmp(name, "G") == 0
+	  || pfxcmp(name, "B") == 0))
+		return MXML_REAL;
+
+	if ((pfxcmp(pname, "ColorCMYK") == 0
+	  || pfxcmp(pname, "ColorSpaceCMYK") == 0)
+	 && (pfxcmp(name, "Cyan") == 0
+	  || pfxcmp(name, "Magenta") == 0
+	  || pfxcmp(name, "Yellow") == 0
+	  || pfxcmp(name, "Black") == 0))
+		return MXML_REAL;
+
+	if ((pfxcmp(pname, "FileInformation") == 0
+	  || pfxcmp(pname, "Header") == 0)
+	 && (pfxcmp(name, "Creator") == 0
+	  || pfxcmp(name, "CreationDate") == 0
+	  || pfxcmp(name, "Description") == 0))
+		return MXML_OPAQUE;		/* Don't split strings up */
+
+	if ((pfxcmp(pname, "IlluminationOptions") == 0
+	  || pfxcmp(pname, "TristimulusSpec") == 0
+	  || pfxcmp(pname, "ColorSpaceSpecificationSpectrumTristimulus") == 0)
+	 && (pfxcmp(name, "Illuminant") == 0
+	  || pfxcmp(name, "Observer") == 0
+	  || pfxcmp(name, "FieldOfView") == 0))
+		return MXML_OPAQUE;		/* Don't split strings up */
+
+
+	return MXML_TEXT;
+}
+
+
+void sax_cb(mxml_node_t *node, mxml_sax_event_t event, void *data) {
+	namedc *p = (namedc *)data;
+
+	if (event == MXML_SAX_ELEMENT_OPEN) {
+		const char *pname = mxmlGetElement(node);
+
+		if (pfxcmp(pname, "Resources") == 0) {
+//printf("~1 open of Resources\n");
+			p->indata = 1;
+		}
+
+		if ((p->options & NAMEDC_OP_NODATA) == 0
+		 || !p->indata) {
+//printf("~1 options 0x%x, indata %d, retaining '%s'\n",p->options,p->indata,pname);
+//a1logd(p->log, 4, "sax_cb: retaining %s\n",pname);
+			mxmlRetain(node);
+		}
+
+	} else if (event == MXML_SAX_DIRECTIVE) {
+		mxmlRetain(node);
+	} else if (event == MXML_SAX_DATA) {
+		/* If the parent was retained, then retain this data node as well. */
+		if (mxmlGetRefCount(mxmlGetParent(node)) > 1) {
+			mxmlRetain(node);
+		}
+	} else if (event == MXML_SAX_ELEMENT_CLOSE) {
+		const char *pname = mxmlGetElement(node);
+		if(pfxcmp(pname, "Resources") == 0) {
+//printf("~1 close of Resources\n");
+			p->indata = 0;
+		}
+	}
+}
+
+
+/* Return a temporary key with prefix */
+char *pfx(namedc *p, char *key) {
+	if (p->pfx[0] == '\000')
+		return key;
+
+	snprintf(p->prefix, 200, "%s:%s", p->pfx, key);
+
+	return p->prefix;
+}
+
+/* Return a temporary key with prefix at front and after each '/' */
+char *pfxp(namedc *p, char *path) {
+	char *cp = p->prefix;
+	char *sp, *ep;
+	int plen, slen;
+
+	if (p->pfx[0] == '\000')
+		return path;
+
+	plen = strlen(p->pfx);
+
+	/* Figure out the first source key */
+	sp = path;
+	if ((ep = strchr(sp, '/')) != NULL) {
+		slen = ep - sp;
+		ep++;				/* Point beyond '/' */
+	} else {
+		slen = strlen(sp);
+		ep = sp + slen;		/* point at '\000' */
+	}
+
+	for (;;) {
+		if ((NAMEDC_PLEN -1 -(cp - p->prefix)) < (plen + 1 + slen))
+			break;			/* No room for prefix + path element */
+
+		strcpy(cp, p->pfx);
+		cp += plen;
+		*cp++ = ':';
+		strncpy(cp, sp, slen);
+		cp += slen;
+		
+		/* Figure out the next source key */
+		sp = ep;
+		
+		if ((ep = strchr(sp, '/')) != NULL) {
+			slen = ep - sp;
+			ep++;				/* Point beyond '/' */
+		} else {
+			slen = strlen(sp);
+			ep = sp + slen;		/* point at '\000' */
+		}
+
+		if (slen <= 0)			/* No more path elements */
+			break;
+
+		if ((NAMEDC_PLEN -1 -(cp - p->prefix)) < 1)
+			break;			/* No room for '/' */
+		*cp++ = '/';
+	}
+	*cp++ = '\000';
+
+	return p->prefix;
+}
+
+/* Return a temporary key with suffix */
+char *sfx(namedc *p, char *key) {
+	if (p->pfx[0] == '\000')
+		return key;
+
+	snprintf(p->prefix, 200, "%s:%s", key, p->pfx);
+
+	return p->prefix;
+}
+
+/* Read in a namedc from a cxf3 file */
+/* Return nz on error */
+static int read_cxf(namedc *p, const char *filename, int options) {
+    FILE *fp;
+	char *pfilename;
+    mxml_node_t *tree, *cxf, *pnode, *node;
+	const char *attr, *name;
+	int cxf2 = 0;
+	int i, j;
+
+	a1logd(p->log, 1, "read_cxf: file '%s' options 0x%x\n",filename,options);
+	
+	if (p->filename == NULL) {
+		if ((pfilename = strdup(filename)) == NULL) {
+			snprintf(p->err, NAMEDC_ERRL, "Malloc of filename failed");
+			a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+			return p->errc = 2;
+		}
+		clear_namedc(p);
+		p->filename = pfilename;
+	}
+	p->options = options;
+
+    if ((fp = fopen(p->filename, "r")) == NULL) {
+		snprintf(p->err, NAMEDC_ERRL, "Opening XML file '%s' failed",p->filename);
+		a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+		return p->errc = 1;
+	}
+
+#ifdef NEVER
+    tree = mxmlLoadFile(NULL, fp, type_cb);
+#else
+	p->indata = 0;
+	tree = mxmlSAXLoadFd(NULL, fileno(fp), type_cb, sax_cb, (void *)p);
+#endif
+    fclose(fp);
+
+	if (tree == NULL) {
+		snprintf(p->err, NAMEDC_ERRL, "Parsing XML file '%s' failed",p->filename);
+		a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+		return p->errc = 1;
+	}
+
+	if ((cxf = mxmlFindElement(tree, tree, NULL, NULL, NULL, MXML_DESCEND_FIRST)) == NULL
+	 || mxmlGetType(cxf) != MXML_ELEMENT) {
+		snprintf(p->err, NAMEDC_ERRL, "Failed to find top element in '%s'",p->filename);
+		a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+		mxmlDelete(tree);
+		return p->errc = 1;
+	}
+	name = cxf->value.element.name;
+
+	if ((attr = strchr(cxf->value.element.name, ':')) != NULL) {
+		int len = attr - name;
+		if (len > 99)
+			len = 99;
+		strncpy(p->pfx, name, len);
+		p->pfx[len] = '\000';
+	} else {
+		p->pfx[0] = '\000';
+	}
+
+	a1logd(p->log, 4, "read_cxf: prefix '%s'\n",p->pfx);
+
+	if (strcmp(name, pfx(p, "CxF")) != 0) {
+		snprintf(p->err, NAMEDC_ERRL, "Top element not called CxF in '%s'",p->filename);
+		a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+		mxmlDelete(tree);
+		return p->errc = 1;
+	}
+
+	/* Check that its CxF3 */
+	if ((attr = mxmlElementGetAttr(cxf, sfx(p, "xmlns"))) == NULL) {
+		snprintf(p->err, NAMEDC_ERRL, "Failed to find CxF attribute %s in '%s'",sfx(p, "xmlns"), p->filename);
+		a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+		mxmlDelete(tree);
+		return p->errc = 1;
+	}
+
+	if (strcmp(attr, "http://colorexchangeformat.com/CxF3-core") != 0) {
+		if (strcmp(attr, "http://colorexchangeformat.com/v2") != 0) {
+			snprintf(p->err, NAMEDC_ERRL, "File '%s' is not CxF format",p->filename);
+			a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+			mxmlDelete(tree);
+			return p->errc = 1;
+		} else {
+			cxf2 = 1;
+			a1logd(p->log, 1, "read_cxf: This is a CxF2 file\n");
+		}
+	} else {
+		a1logd(p->log, 1, "read_cxf: This is a CxF3 file\n");
+	}
+
+	/* Grab the description */
+	if (cxf2) {
+		if ((node = mxmlFindPathNode(cxf, pfxp(p,"Palette"))) == NULL
+		 || (name = mxmlElementGetAttr(node, "PaletteName")) == NULL)
+			name = NULL;
+
+		if (name == NULL)
+			name = p->filename;
+		if ((p->description = strdup(name)) == NULL) {
+			snprintf(p->err, NAMEDC_ERRL, "Malloc of description string failed");
+			a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+			mxmlDelete(tree);
+			return p->errc = 2;
+		}
+		a1logd(p->log, 2, "read_cxf: description '%s'\n",p->description);
+	
+		p->hash = do_hash2(p->filename, p->description);
+	
+	} else {	/* else cxf3 */
+		if ((node = mxmlFindPathNode(cxf, pfxp(p,"FileInformation/Description"))) == NULL)
+			name = NULL;
+		else
+			name = mxmlGetOpaque(node);
+		if (name == NULL)
+			name = p->filename;
+		if ((p->description = strdup(name)) == NULL) {
+			snprintf(p->err, NAMEDC_ERRL, "Malloc of description string failed");
+			a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+			mxmlDelete(tree);
+			return p->errc = 2;
+		}
+		a1logd(p->log, 2, "read_cxf: description '%s'\n",p->description);
+	
+		p->hash = do_hash2(p->filename, p->description);
+	}
+		
+	if ((p->options & NAMEDC_OP_NODATA) == 0) {
+		char *SampleKey = NULL;
+		char *SampleNameKey = NULL;
+		char *SampleLabKey = NULL;
+		char *SampleXYZKey = NULL;
+		char *SampleCMYKKey = NULL;
+		const char *colorSpecification = NULL;	/* cxf3 ColorSpecification of Lab or XYZ */
+
+		if (cxf2) {
+			/* Locate the Palette/ColorSet node */
+			if ((pnode = mxmlFindPathNode(cxf, pfxp(p,"Palette/ColorSet"))) == NULL) {
+				snprintf(p->err, NAMEDC_ERRL, "Failed to find Resources/ObjectCollection in '%s'",p->filename);
+				a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+				mxmlDelete(tree);
+				return p->errc = 1;
+			}
+			SampleKey = "Color";
+			SampleNameKey = "ColorName";
+			SampleLabKey = "ColorSpaceCIELab";
+			SampleXYZKey = "ColorSpaceCIEXYZ";
+			SampleCMYKKey = "ColorSpaceCMYK";
+
+		} else {
+			/* Locate the Resources/ObjectCollection node */
+			if ((pnode = mxmlFindPathNode(cxf, pfxp(p,"Resources/ObjectCollection"))) == NULL) {
+				snprintf(p->err, NAMEDC_ERRL, "Failed to find Resources/ObjectCollection in '%s'",p->filename);
+				a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+				mxmlDelete(tree);
+				return p->errc = 1;
+			}
+			SampleKey = "Object"; 
+			SampleNameKey = "Name";
+			SampleLabKey = "ColorCIELab";
+			SampleXYZKey = "ColorCIEXYZ";
+			SampleCMYKKey = "ColorCMYK";
+		}
+
+		/* - - - - - - - - - - - - */
+		/* Read all the colors. */
+		/* Start with first node */
+		node = mxmlFindElement(pnode, pnode, pfx(p,SampleKey), NULL, NULL, MXML_DESCEND_FIRST);
+		for (i = 0; node != NULL; i++) {
+			int j;
+		    mxml_node_t *ppvals, *pvals, *val;
+			const char *name;
+			double Lab[3];
+			int Lab_v = 0;
+			double dev[MAX_CHAN];
+			int dev_n = 0;
+			icColorSpaceSignature devSig = icMaxEnumData;
+			
+			if (mxmlGetType(node) != MXML_ELEMENT) {
+				a1logd(p->log, DEB6, "read_cxf: skipping non element node type %d\n",mxmlGetType(node));
+				goto next;
+			}
+			a1logd(p->log, DEB6, "read_cxf: read node '%s'\n",node->value.element.name);
+
+			if (strcmp(node->value.element.name, pfx(p,SampleKey)) != 0) {
+				a1logd(p->log, DEB6, "read_cxf: skipping non %s node\n",SampleKey);
+				goto next; 
+			}
+ 
+			if (!cxf2) {
+				/* Get the ObjectType attribute of Object */
+				if ((attr = mxmlElementGetAttr(node, "ObjectType")) == NULL) {
+					a1logd(p->log, DEB6, "read_cxf: skipping node without ObjectType\n");
+					goto next;							/* Skip this one */
+				}
+	
+				/* Check the attribute value */
+				if (strcmp(attr, "Standard") != 0) {
+					a1logd(p->log, DEB6, "read_cxf: skipping node with ObjectType = '%s'\n",attr);
+					goto next;							/* Skip this one */
+				}
+			}
+
+			if ((attr = mxmlElementGetAttr(node, SampleNameKey)) == NULL) {
+				a1logd(p->log, DEB6, "read_cxf: skipping without %s\n",SampleNameKey);
+				goto next;							/* Skip this one */
+			}
+			name = attr;
+
+			a1logd(p->log, DEB4, "read_cxf: got color %d name '%s'\n",i,name);
+
+			if (!cxf2) {
+				if ((ppvals = mxmlFindElement(node, node, pfx(p,"ColorValues"), NULL, NULL, MXML_DESCEND_FIRST)) == NULL) {
+					a1logd(p->log, DEB4, "read_cxf: no reference ColorValuesname  - skipping\n");
+					goto next;
+				}
+			} else {
+				ppvals = node;
+			}
+
+			if ((p->options & NAMEDC_OP_NOSPEC) == 0) {
+				/* ~~~~9999 should look for spectral */
+			}
+
+			/* See if there is ColorCIELab */
+			if ((pvals = mxmlFindElement(ppvals, ppvals, pfx(p,SampleLabKey), NULL, NULL, MXML_DESCEND_FIRST)) != NULL) {
+				char *key[3] = { "L", "A", "B" };
+
+				/* Check which color specification is being used with Lab */
+				if (!cxf2 && colorSpecification == NULL) {
+					colorSpecification = mxmlElementGetAttr(pvals, "ColorSpecification");
+				}
+
+				for (j = 0; j < 3; j++) {
+					if ((val = mxmlFindElement(pvals, pvals, pfx(p, key[j]), NULL, NULL, MXML_DESCEND_FIRST)) == NULL) {
+						a1logd(p->log, DEB6, "read_cxf: failed to find ColorCIELab component %s\n",key[j]);
+						break;		/* oops */
+					}
+					Lab[j] = mxmlGetReal(val);
+					a1logd(p->log, DEB6, "read_cxf: got ColorCIELab component %s value %f\n",key[j],Lab[j]);
+				}
+				if (j >= 3)
+					Lab_v = 1;
+			}
+
+			if (!Lab_v) {
+
+				a1logd(p->log, DEB6, "read_cxf: no valid ColorCIELab value, look for XYZ\n");
+
+				/* See if there is ColorCIEXYZ instead */
+				if ((pvals = mxmlFindElement(ppvals, ppvals, pfx(p,SampleXYZKey), NULL, NULL, MXML_DESCEND_FIRST)) != NULL) {
+					char *key[3] = { "X", "Y", "Z" };
+
+					/* Check which color specification is being used with Lab */
+					if (!cxf2 && colorSpecification == NULL) {
+						colorSpecification = mxmlElementGetAttr(pvals, "ColorSpecification");
+					}
+
+					for (j = 0; j < 3; j++) {
+						if ((val = mxmlFindElement(pvals, pvals, pfx(p, key[j]), NULL, NULL, MXML_DESCEND_FIRST)) == NULL) {
+							a1logd(p->log, DEB6, "read_cxf: failed to find ColorCIEXYZ component %s\n",key[j]);
+							break;		/* oops */
+						}
+						Lab[j] = mxmlGetReal(val);
+						a1logd(p->log, DEB6, "read_cxf: got ColorCIEXYZ component %s value %f\n",key[j],Lab[j]);
+					}
+					if (j >= 3) {
+						icmXYZ2Lab(&icmD50, Lab, Lab);
+						Lab_v = 1;
+					}
+				}
+			}
+
+			if (!Lab_v) {
+				a1logd(p->log, DEB6, "read_cxf: no CIE value found - skipping color\n");
+				goto next;
+			}
+		
+			/* Read any device color values */
+			if (!cxf2) {
+				if ((ppvals = mxmlFindElement(node, node, pfx(p,"DeviceColorValues"), NULL, NULL, MXML_DESCEND_FIRST)) != NULL) {
+
+					a1logd(p->log, DEB4, "read_cxf: got DeviceColorValues\n");
+				}
+			}
+
+			if (ppvals != NULL) {
+
+				// ~~99 could add read of other device values here
+
+				/* See if there is ColorCMYK */
+				if ((pvals = mxmlFindElement(ppvals, ppvals, pfx(p,SampleCMYKKey), NULL, NULL, MXML_DESCEND_FIRST)) != NULL) {
+					char *key[4] = { "Cyan", "Magenta", "Yellow", "Black" };
+
+					a1logd(p->log, DEB4, "read_cxf: got ColorCMYK\n");
+					for (j = 0; j < 4; j++) {
+						if ((val = mxmlFindElement(pvals, pvals, pfx(p, key[j]), NULL, NULL, MXML_DESCEND_FIRST)) == NULL) {
+							a1logd(p->log, DEB6, "read_cxf: failed to find ColorCMYK component %s\n",key[j]);
+							break;		/* oops */
+						}
+						dev[j] = mxmlGetReal(val);
+						a1logd(p->log, DEB6, "read_cxf: got ColorCMYK component %s value %f\n",key[j],dev[j]);
+					}
+					if (j >= 4) {
+						dev_n = j;
+						devSig = icSigCmykData;
+					}
+				}
+			}
+		
+			/* Add an entry */
+			if (p->count >= p->count_a) {
+				unsigned int count_n;
+				count_n = p->count_a + 4096/sizeof(nce);
+
+				a1logd(p->log, 8, "read_cxf: increasing data array size to %d\n",count_n);
+				if ((p->data = recalloc(p->data, p->count_a, sizeof(nce), count_n, sizeof(nce))) == NULL) {
+					snprintf(p->err, NAMEDC_ERRL, "Malloc of data size %d failed",p->count_a);
+					a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+					mxmlDelete(tree);
+					return p->errc = 2;
+				}
+				p->count_a = count_n;
+			}
+			clear_nce(&p->data[p->count]);
+
+			if ((p->data[p->count].name = strdup(name)) == NULL) {
+				snprintf(p->err, NAMEDC_ERRL, "Malloc of color name string failed");
+				a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+				mxmlDelete(tree);
+				return p->errc = 2;
+			}
+			
+			if (Lab_v) {
+				p->data[p->count].Lab[0] = Lab[0];
+				p->data[p->count].Lab[1] = Lab[1];
+				p->data[p->count].Lab[2] = Lab[2];
+				p->data[p->count].Lab_v = 1;
+			}
+
+			if (dev_n > 0 && devSig != icMaxEnumData) {
+				for (j = 0; j < dev_n; j++)
+					p->data[p->count].dev[j] = dev[j];
+				p->data[p->count].dev_n = dev_n;
+				p->data[p->count].devSig = devSig;
+			} else {
+				p->data[p->count].dev_n = 0;
+				p->data[p->count].devSig = icMaxEnumData;
+			}
+
+			a1logd(p->log, 8, "read_cxf: added color %d\n",p->count);
+
+			p->count++;
+
+		next:;	/* Next color */
+			node = mxmlGetNextSibling(node);
+		}
+
+		/* - - - - - - - - - - - - */
+		/* Read extra information */
+		if (cxf2) {
+			/* Grab the creator */
+			if ((node = mxmlFindPathNode(cxf, pfxp(p,"Preamble/Header/Creator"))) == NULL)
+				name = NULL;
+			else
+				name = mxmlGetOpaque(node);
+	
+			if (name == NULL)
+				name = "[Unknown]";
+			if ((p->creator = strdup(name)) == NULL) {
+				snprintf(p->err, NAMEDC_ERRL, "Malloc of creator string failed");
+				a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+				mxmlDelete(tree);
+				return p->errc = 2;
+			}
+			a1logd(p->log, 2, "read_cxf: creator '%s'\n",p->creator);
+
+			/* Grab the illuminant type */
+			if ((node = mxmlFindPathNode(cxf, pfxp(p,"Palette/ColorSet/CollectionColorSpaceSpecification/ColorSpaceSpecificationSpectrumTristimulus/IlluminationOptions/Illuminant"))) == NULL
+			 || (name = mxmlGetOpaque(node)) == NULL) {
+				a1logd(p->log, 2, "read_cxf: failed to locate Illuminant - assuming D50\n");
+				p->ill = icxIT_D50;
+			} else {
+				if (strcmp(name, "Illuminant_A") == 0)
+					p->ill = icxIT_A;
+				else if (strcmp(name, "Illuminant_D50") == 0)
+					p->ill = icxIT_D50;
+				else if (strcmp(name, "Illuminant_D55") == 0)
+					p->ill = icxIT_D55;
+				else if (strcmp(name, "Illuminant_D65") == 0)
+					p->ill = icxIT_D65;
+				else if (strcmp(name, "Illuminant_E") == 0)
+					p->ill = icxIT_E;
+				else {
+					a1logd(p->log, 2, "read_cxf: Illuminant '%s' unrecognised\n",name);
+					p->ill = icxIT_D50;
+				}
+			}
+			a1logd(p->log, 2, "read_cxf: illuminant '%s'\n",icm2str(icmIlluminant, p->ill));
+
+			/* Grab the observer type */
+			if ((node = mxmlFindPathNode(cxf, pfxp(p,"Palette/ColorSet/CollectionColorSpaceSpecification/ColorSpaceSpecificationSpectrumTristimulus/FieldOfView"))) == NULL
+			 || (name = mxmlGetOpaque(node)) == NULL) {
+				a1logd(p->log, 2, "read_cxf: failed to locate FieldOfView - assuming 2 degree\n");
+				p->obs = icxOT_CIE_1931_2;
+			} else {
+				if (strcmp(name, "FieldOfView_2_Degree") == 0)
+					p->obs = icxOT_CIE_1931_2;
+				else if (strcmp(name, "FieldOfView_10_Degree") == 0)
+					p->obs = icxOT_CIE_1964_10;
+				else {
+					a1logd(p->log, 2, "read_cxf: Illuminant '%s' unrecognised\n",name);
+					p->obs = icxOT_CIE_1931_2;
+				}
+			}
+			a1logd(p->log, 2, "read_cxf: observer '%s'\n",icm2str(icmStandardObserver, p->obs));
+
+		} else {
+			int found_io = 0;
+
+			/* Grab the creator */
+			if ((node = mxmlFindPathNode(cxf, pfxp(p,"FileInformation/Creator"))) == NULL)
+				name = NULL;
+			else
+				name = mxmlGetOpaque(node);
+	
+			if (name == NULL)
+				name = "[Unknown]";
+			if ((p->creator = strdup(name)) == NULL) {
+				snprintf(p->err, NAMEDC_ERRL, "Malloc of creator string failed");
+				a1logd(p->log, 1, "read_cxf: %s\n",p->err);
+				mxmlDelete(tree);
+				return p->errc = 2;
+			}
+			a1logd(p->log, 2, "read_cxf: creator '%s'\n",p->creator);
+
+			if (colorSpecification != NULL) {
+				a1logd(p->log, 2, "read_cxf: colorSpecification '%s'\n",colorSpecification);
+			}
+
+			/* Look through the color specifications and find the one that matches */
+			/* the Lab or XYZ color specification */
+			pnode = mxmlFindPathNode(cxf, pfxp(p,"Resources/ColorSpecificationCollection/ColorSpecification"));
+			while (pnode != NULL) {
+				name = mxmlElementGetAttr(pnode, "Id");
+
+				if (colorSpecification == NULL
+				 || (name != NULL && strcmp(name, colorSpecification) == 0)) {
+		
+					a1logd(p->log, 2, "read_cxf: found node matching colorSpecification '%s'\n",colorSpecification);
+
+					/* Grab the illuminant type */
+					if ((node = mxmlFindPathNode(pnode, pfxp(p,"TristimulusSpec/Illuminant"))) == NULL
+					 || (name = mxmlGetOpaque(node)) == NULL) {
+						a1logd(p->log, 2, "read_cxf: failed to locate Illuminant - assuming D50\n");
+						p->ill = icxIT_D50;
+					} else {
+						if (strcmp(name, "A") == 0)
+							p->ill = icxIT_A;
+						else if (strcmp(name, "D50") == 0)
+							p->ill = icxIT_D50;
+						else if (strcmp(name, "D55") == 0)
+							p->ill = icxIT_D55;
+						else if (strcmp(name, "D65") == 0)
+							p->ill = icxIT_D65;
+						else if (strcmp(name, "E") == 0)
+							p->ill = icxIT_E;
+						else {
+							a1logd(p->log, 2, "read_cxf: Illuminant '%s' unrecognised\n",name);
+							p->ill = icxIT_D50;
+						}
+					}
+					a1logd(p->log, 2, "read_cxf: illuminant '%s'\n",icm2str(icmIlluminant, p->ill));
+		
+					/* Grab the first observer type */
+					if ((node = mxmlFindPathNode(cxf, pfxp(p,"Resources/ColorSpecificationCollection/ColorSpecification/TristimulusSpec/Observer"))) == NULL
+					 || (name = mxmlGetOpaque(node)) == NULL) {
+						a1logd(p->log, 2, "read_cxf: failed to locate Observer - assuming 2 degree\n");
+						p->obs = icxOT_CIE_1931_2;
+					} else {
+						if (strcmp(name, "2_Degree") == 0)
+							p->obs = icxOT_CIE_1931_2;
+						else if (strcmp(name, "10_Degree") == 0)
+							p->obs = icxOT_CIE_1964_10;
+						else {
+							a1logd(p->log, 2, "read_cxf: Illuminant '%s' unrecognised\n",name);
+							p->obs = icxOT_CIE_1931_2;
+						}
+					}
+					a1logd(p->log, 2, "read_cxf: observer '%s'\n",icm2str(icmStandardObserver, p->obs));
+					found_io = 1;
+					break;
+				}
+				pnode = mxmlGetNextSibling(pnode);
+			}
+
+			if (!found_io) {
+				p->ill = icIlluminantD50;
+				p->obs = icStdObs1931TwoDegrees;
+				a1logd(p->log, 2, "read_cxf: failed to locate ColorSpecification - assuming D50 2 degree observer\n");
+			}
+
+			/* Other values of interest:
+			   Resources/ColorSpecificationCollection/ColorSpecification/ColorSpecification/MeasurementSpec/MeasurementType	ie. "Spectrum_Reflectance"
+			   Resources/ColorSpecificationCollection/ColorSpecification/ColorSpecification/MeasurementSpec/CalibrationStandard	ie. "GMDI" for Gretag Macbeth Calibration, "XRGA" for X-Rite Graphic Arts Standard.
+			   Resources/ColorSpecificationCollection/ColorSpecification/ColorSpecification/MeasurementSpec/Device/DeviceFilter	ie. "Filter_None" "Filter_UVExcluded", 
+			 */
+		}
+	}
+
+	mxmlDelete(tree);
+
+	a1logd(p->log, 1, "read_cxf: done - %d colors\n",p->count);
+	return 0;
+}
+
+/* Read in a namedc from a ICC file */
+/* Return nz on error */
+static int read_icc(namedc *p, const char *filename, int options) {
+	char *pfilename;
+	icmFile *fp;
+	icc *icco;
+
+	a1logd(p->log, 1, "read_icc: file '%s' options 0x%x\n",filename,options);
+
+	if (p->filename == NULL) {
+		if ((pfilename = strdup(filename)) == NULL) {
+			snprintf(p->err, NAMEDC_ERRL, "Malloc of filename failed");
+			a1logd(p->log, 1, "read_icc: %s\n",p->err);
+			return p->errc = 2;
+		}
+		clear_namedc(p);
+		p->filename = pfilename;
+	}
+	p->options = options;
+	
+	/* Open up the file for reading */
+	if ((fp = new_icmFileStd_name(p->filename,"r")) == NULL) {
+		snprintf(p->err, NAMEDC_ERRL, "Opening ICC file '%s' failed",p->filename);
+		a1logd(p->log, 1, "read_icc: %s\n",p->err);
+		return p->errc = 1;
+	}
+
+	if ((icco = new_icc()) == NULL) {
+		snprintf(p->err, NAMEDC_ERRL, "Creation ICC object failed");
+		a1logd(p->log, 1, "read_icc: %s\n",p->err);
+		fp->del(fp);
+		return p->errc = 1;
+	}
+
+	if (icco->read(icco, fp, 0) != 0) {
+		snprintf(p->err, NAMEDC_ERRL, "Failed to read '%s'\n",p->filename);
+		a1logd(p->log, 1, "read_icc: %s\n",p->err);
+		icco->del(icco);
+		fp->del(fp);
+		return p->errc = 1;
+	}
+
+	if (icco->header->deviceClass != icSigNamedColorClass) {
+		snprintf(p->err, NAMEDC_ERRL, "Not a named color profile");
+		a1logd(p->log, 1, "read_icc: %s\n",p->err);
+		icco->del(icco);
+		fp->del(fp);
+		return p->errc = 1;
+	}
+
+	if (icco->header->pcs != icSigXYZData
+	 && icco->header->pcs != icSigLabData) {
+		snprintf(p->err, NAMEDC_ERRL, "Unrecognised PCS");
+		a1logd(p->log, 1, "read_icc: %s\n",p->err);
+		icco->del(icco);
+		fp->del(fp);
+		return p->errc = 1;
+	}
+
+	if (icco->find_tag(icco, icSigNamedColor2Tag) != 0) {
+		snprintf(p->err, NAMEDC_ERRL, "Can't find ncl2 tag");
+		a1logd(p->log, 1, "read_icc: %s\n",p->err);
+		icco->del(icco);
+		fp->del(fp);
+		return p->errc = 1;
+	}
+
+	{
+		icmTextDescription *txd;
+
+		/* Try and read the tag from the file */
+		if ((txd = (icmTextDescription *)icco->read_tag(icco, icSigProfileDescriptionTag)) == NULL) {
+			snprintf(p->err, NAMEDC_ERRL, "No description tag");
+			a1logd(p->log, 1, "read_icc: %s\n",p->err);
+			icco->del(icco);
+			fp->del(fp);
+			return p->errc = 1;
+		}
+
+		if ((p->description = strdup(txd->desc)) == NULL) {
+			snprintf(p->err, NAMEDC_ERRL, "Malloc of description string failed");
+			a1logd(p->log, 1, "read_icc: %s\n",p->err);
+			icco->del(icco);
+			fp->del(fp);
+			return p->errc = 2;
+		}
+		a1logd(p->log, 2, "read_icc: description '%s'\n",p->description);
+	}
+
+	p->hash = do_hash2(p->filename, p->description);
+
+	if ((p->options & NAMEDC_OP_NODATA) == 0) {
+		icmNamedColor *tag;
+		char name[3 * 32];
+		double Lab[3];
+		int Lab_v = 0;
+		double dev[MAX_CHAN];
+		int dev_n = 0;
+		icColorSpaceSignature devSig = icMaxEnumData;
+		int i, j;
+		
+#ifdef NEVER
+		/* See if there is a measurementType tag */
+		icmMeasurement *meastag;
+		if ((meastag = (icmMeasurement *)icco->read_tag(icco, icSigMeasurementTag)) != NULL) {
+			p->ill = meastag->illuminant;
+			p->obs = meastag->observer;
+			a1logd(p->log, 2, "read_cxf: assuming D50 illuminant and 2 degree observer\n");
+		} else {
+			p->ill = icIlluminantD50;
+			p->obs = icStdObs1931TwoDegrees;
+		}
+		a1logd(p->log, 2, "read_cxf: illuminant '%s'\n",icm2str(icmIlluminant, p->ill));
+		a1logd(p->log, 2, "read_cxf: observer '%s'\n",icm2str(icmStandardObserver, p->obs));
+#endif
+
+		if ((tag = (icmNamedColor *)icco->read_tag(icco, icSigNamedColor2Tag)) == NULL) {
+			snprintf(p->err, NAMEDC_ERRL, "Can't read ncl2 tag");
+			a1logd(p->log, 1, "read_icc: %s\n",p->err);
+			icco->del(icco);
+			fp->del(fp);
+			return p->errc = 1;
+		}
+
+		for (i = 0; i < tag->count; i++) {
+
+			/* Get the name */
+			strcpy(name, tag->prefix);
+			strcat(name, tag->data[i].root);
+			strcat(name, tag->suffix);
+
+			a1logd(p->log, DEB4, "read_icc: got color %d name '%s'\n",i,name);
+
+			if (icco->header->pcs == icSigXYZData) {
+				Lab[0] = tag->data[i].pcsCoords[0];
+				Lab[1] = tag->data[i].pcsCoords[1];
+				Lab[2] = tag->data[i].pcsCoords[2];
+				icmXYZ2Lab(&icmD50, Lab, Lab);
+
+			} else {		/* Lab */
+				Lab[0] = tag->data[i].pcsCoords[0];
+				Lab[1] = tag->data[i].pcsCoords[1];
+				Lab[2] = tag->data[i].pcsCoords[2];
+			}
+			Lab_v = 1;
+			a1logd(p->log, DEB6, "read_icc: got ColorCIELab value %s\n",icmPdv(3, Lab));
+
+			/* Add any device space */
+			devSig = icco->header->colorSpace;
+			dev_n = icmCSSig2nchan(devSig);
+			for (j = 0; j < dev_n; j++)
+				dev[j] = tag->data[i].deviceCoords[j];
+
+			a1logd(p->log, DEB6, "read_icc: got %s value %s\n",
+			       icm2str(icmColorSpaceSignature, devSig), icmPdv(dev_n, dev));
+
+			/* Add an entry */
+			if (p->count >= p->count_a) {
+				unsigned int count_n;
+				count_n = p->count_a + 4096/sizeof(nce);
+
+				a1logd(p->log, 8, "read_icc: increasing data array size to %d\n",count_n);
+				if ((p->data = recalloc(p->data, p->count_a, sizeof(nce), count_n, sizeof(nce))) == NULL) {
+					snprintf(p->err, NAMEDC_ERRL, "Malloc of data size %d failed",p->count_a);
+					a1logd(p->log, 1, "read_icc: %s\n",p->err);
+					icco->del(icco);
+					fp->del(fp);
+					return p->errc = 2;
+				}
+				p->count_a = count_n;
+			}
+			clear_nce(&p->data[p->count]);
+
+			if ((p->data[p->count].name = strdup(name)) == NULL) {
+				snprintf(p->err, NAMEDC_ERRL, "Malloc of color name string failed");
+				a1logd(p->log, 1, "read_icc: %s\n",p->err);
+				icco->del(icco);
+				fp->del(fp);
+				return p->errc = 2;
+			}
+			
+			if (Lab_v) {
+				p->data[p->count].Lab[0] = Lab[0];
+				p->data[p->count].Lab[1] = Lab[1];
+				p->data[p->count].Lab[2] = Lab[2];
+				p->data[p->count].Lab_v = 1;
+			}
+
+			if (dev_n > 0 && devSig != icMaxEnumData) {
+				for (j = 0; j < dev_n; j++)
+					p->data[p->count].dev[j] = dev[j];
+				p->data[p->count].dev_n = dev_n;
+				p->data[p->count].devSig = devSig;
+			} else {
+				p->data[p->count].dev_n = 0;
+				p->data[p->count].devSig = icMaxEnumData;
+			}
+
+			a1logd(p->log, 8, "read_icc: added color %d\n",p->count);
+
+			p->count++;
+
+		next:;	/* Next color */
+		}
+	}
+
+	icco->del(icco);
+	fp->del(fp);
+
+	return 0;
+}
+
+/* Read any format named color files */
+/* Return nz on error */
+static int read_nc(namedc *p, const char *filename, int options) {
+	int rv;
+
+	if ((p->format == 0 || p->format == 1)
+	 && (rv = read_cxf(p, filename, options)) == 0) {
+		p->format = 1;
+		return rv;
+	} 
+
+	if ((p->format == 0 || p->format == 2)
+	 && (rv = read_icc(p, filename, options)) == 0) {
+		p->format = 2;
+		return rv;
+	} 
+
+	/* Try other file types here */
+	
+	return rv;
+}
+
+
+/* Return the index of the best mataching color, -1 on error. */
+/* Lab[] is assumed to be D50, 2 degree standard observer based CIE value, */
+/* and the spec value should only be provided if this is a reflective or */
+/* transmissive measurement, NULL if emissive. */
+/* If named color library is expects other than D50, 2 degree, then */
+/* it will use the spectral value if not NULL, or chromatically */
+/* adapt the Lab value. */
+/* deType == 0 DE76 */
+/* deType == 1 DE94 */
+/* deType == 2 DE2000 */
+/* if de != NULL, return the delta E */
+int match(struct _namedc *p, double *de, double *pLab, xspect *rspect, int deType) {
+	int i, bix = -1;
+	double bde = 1e99;
+	double Lab[3];
+
+	if (p->filename == NULL) {		/* We haven't been opened */
+		snprintf(p->err, NAMEDC_ERRL, "We haven't been opened");
+		a1logd(p->log, 1, "match: %s\n",p->err);
+		return -1;
+	}
+
+	/* If the colors haven't been read yet, read them now */
+	if (p->data == NULL || (p->options & NAMEDC_OP_NODATA)) {
+		if (read_nc(p, NULL, (p->options & ~NAMEDC_OP_NODATA))) {
+			a1logd(p->log, 1, "match: on demand data load failed with '%s'\n",p->err);
+			return -1;
+		}
+		a1logd(p->log, 1, "match: after loading there are %d colors\n",p->count);
+	}
+
+	icmCpy3(Lab, pLab);
+
+	if (p->ill != icIlluminantD50 || p->obs != icStdObs1931TwoDegrees) {
+		if (rspect != NULL) {
+
+			if (p->sp2cie == NULL) {
+				if ((p->sp2cie = new_xsp2cie(p->ill, NULL, p->obs, NULL, icSigLabData, 0)) == NULL) {
+					snprintf(p->err, NAMEDC_ERRL, "creating spetral conversion failed");
+					a1logd(p->log, 1, "match: %s\n",p->err);
+					return -1;
+					
+				}
+			}
+
+			/* Convert spectrum to the XYZ we want */
+			p->sp2cie->convert(p->sp2cie, Lab, rspect); 
+
+		} else {
+			if (p->chrom[0][0] <= -1e38) {
+				double wXYZ[3];
+
+				// Special case this for a consistent value with ICC profiles
+				if (p->obs == icxOT_CIE_1931_2 && p->ill == icxIT_D65) {
+					icmCpy3(wXYZ, icmD65_ary3);
+				} else { 
+					xsp2cie *tt;
+					xspect ts;
+					// Get the XYZ of the given white point for the illuminant and observer
+					if ((tt = new_xsp2cie(p->ill, NULL, p->obs, NULL, icSigXYZData, 0)) == NULL) {
+						snprintf(p->err, NAMEDC_ERRL, "creating spetral conversion failed");
+						a1logd(p->log, 1, "match: %s\n",p->err);
+						return -1;
+					}
+					if (standardIlluminant(&ts, icxIT_E, 0.0)) {
+						snprintf(p->err, NAMEDC_ERRL, "match: creating E type spectrum failed");
+						a1logd(p->log, 1, "match: %s\n",p->err);
+						return -1;
+					} 
+					tt->convert(tt, wXYZ, &ts);
+					tt->del(tt);
+				}
+				icmAry2XYZ(p->dXYZ, wXYZ);
+
+				/* Chreate chromatic adapation matrix from D50 to named color */
+				icmChromAdaptMatrix(ICM_CAM_BRADFORD, p->dXYZ, icmD50, p->chrom);
+			}
+			icmLab2XYZ(&icmD50, Lab, pLab);
+			icmMulBy3x3(Lab, p->chrom, Lab);
+			icmXYZ2Lab(&p->dXYZ, Lab, Lab);
+		}
+	}
+ 
+	if (deType == 0) {
+		for (i = 0; i < p->count; i++) {
+			double de = icmLabDEsq(Lab, p->data[i].Lab);
+			if (de < bde) {
+				bde = de;
+				bix = i;
+			}
+		}
+
+	} else if (deType == 1) {
+		for (i = 0; i < p->count; i++) {
+			double de = icmCIE94sq(Lab, p->data[i].Lab);
+			if (de < bde) {
+				bde = de;
+				bix = i;
+			}
+		}
+
+	} else if (deType == 2) {
+		for (i = 0; i < p->count; i++) {
+			double de = icmCIE2Ksq(Lab, p->data[i].Lab);
+			if (de < bde) {
+				bde = de;
+				bix = i;
+			}
+		}
+	} else {
+		snprintf(p->err, NAMEDC_ERRL, "Unnown deType %d",deType);
+		a1logd(p->log, 1, "match: %s\n",p->err);
+		return -1;
+	}
+
+	if (bix < 0) {
+		snprintf(p->err, NAMEDC_ERRL, "No colors to match against");
+		a1logd(p->log, 1, "match: %s\n",p->err);
+		return -1;
+	}
+	if (de != NULL) {
+		*de = sqrt(bde);
+	}
+	return bix;
+}
+
+/* Free an entry */
+static void clear_nce(nce *p) {
+	if (p != NULL) {
+		if (p->name != NULL)
+			free(p->name);
+		p->name = NULL;
+		if (p->sp != NULL)
+			free(p->sp);
+		p->sp = NULL;
+	}
+}
+
+/* Free the contents */
+static void clear_namedc(namedc *p) {
+	if (p != NULL) {
+		int i;
+		if (p->filename != NULL)
+			free(p->filename);
+		p->filename = NULL;
+		if (p->creator != NULL)
+			free(p->creator);
+		p->creator = NULL;
+		if (p->description != NULL)
+			free(p->description);
+		p->description = NULL;
+		if (p->data != NULL) {
+			for (i = 0; i < p->count; i++)
+				clear_nce(&p->data[i]);
+			free(p->data);
+			p->data = NULL;
+		}
+		p->count = 0;
+	}
+}
+
+/* Delete it */
+static void del_namedc(namedc *p) {
+	if (p != NULL) {
+		clear_namedc(p);
+		p->log = del_a1log(p->log);
+		if (p->sp2cie != NULL)
+			p->sp2cie->del(p->sp2cie);
+		free(p);
+	}
+}
+
+/* Allocate a new, uninitialised namedc */
+/* Note thate black and white points aren't allocated */
+namedc *new_namedc(a1log *log) {
+	namedc *p;
+
+	a1logd(log, 1, "new_cxf\n");
+
+	if ((p = (namedc *)calloc(1, sizeof(namedc))) == NULL) {
+		a1logd(p->log, 1, "new_cxf: calloc failed\n");
+		return NULL;
+	}
+
+	p->log = new_a1log_d(log);
+
+	/* Init method pointers */
+	p->del        = del_namedc;
+	p->read_cxf   = read_cxf;
+	p->read_icc   = read_icc;
+	p->read       = read_nc;
+	p->match      = match;
+
+	p->chrom[0][0] = -1e38;
+
+	return p;
+}
+
+
+/* =========================================================================== */
+
+#else /* STANDALONE_TEST */
+
+void usage(char *diag, ...) {
+	fprintf(stderr,"Test namedc library\n");
+	fprintf(stderr,"Author: Graeme W. Gill\n");
+	if (diag != NULL) {
+		va_list args;
+		fprintf(stderr,"  Diagnostic: ");
+		va_start(args, diag);
+		vfprintf(stderr, diag, args);
+		va_end(args);
+		fprintf(stderr,"\n");
+	}
+	fprintf(stderr,"usage: namedc [-v level] infile\n");
+	fprintf(stderr," -D level               Debug level 1-9\n");
+	exit(1);
+}
+
+int
+main(int argc, char *argv[]) {
+	int fa,nfa;				/* argument we're looking at */
+	char inname[MAXNAMEL+1];
+	int debug = 0, i;
+	namedc *p;
+
+	/* Process the arguments */
+	for(fa = 1;fa < argc;fa++) {
+		nfa = fa;					/* skip to nfa if next argument is used */
+		if (argv[fa][0] == '-')	{	/* Look for any flags */
+			char *na = NULL;		/* next argument after flag, null if none */
+
+			if (argv[fa][2] != '\000')
+				na = &argv[fa][2];		/* next is directly after flag */
+			else {
+				if ((fa+1) < argc) {
+					if (argv[fa+1][0] != '-') {
+						nfa = fa + 1;
+						na = argv[nfa];		/* next is seperate non-flag argument */
+					}
+				}
+			}
+
+			if (argv[fa][1] == '?')
+				usage(NULL);
+
+			/* Debug level */
+			else if (argv[fa][1] == 'D') {
+				fa = nfa;
+				if (na != NULL) 
+					debug = atoi(na);
+			}
+
+			else 
+				usage("Unknown option '%c'",argv[fa][1]);
+		}
+		else
+			break;
+	}
+
+	if (fa >= argc || argv[fa][0] == '-') usage("Missing input filename");
+	strncpy(inname,argv[fa++],MAXNAMEL); inname[MAXNAMEL] = '\000';
+
+	g_log->debug = debug;
+
+	if ((p = new_namedc(g_log)) == NULL)
+		error("new_namedc failed\n");
+
+	/* Open non-data */
+	if (p->read(p, inname, NAMEDC_OP_NODATA)) {
+		error("read failed with '%s'\n",p->err);
+	}
+
+	printf("Palette is '%s'\n",p->description);
+	{
+		double Lab[3], de;
+		int ix;
+		
+		Lab[0] = 50.0;
+		Lab[1] = 20.0;
+		Lab[2] = -10.0;
+
+		if ((ix = p->match(p, &de, Lab, NULL, 0)) < 0)
+			error(" match failed with '%s'\n",p->err);
+		printf("Matched color '%s' with DE76 %f\n",p->data[ix].name,de);
+
+		if ((ix = p->match(p, &de, Lab, NULL, 1)) < 0)
+			error(" match failed with '%s'\n",p->err);
+		printf("Matched color '%s' with DE94 %f\n",p->data[ix].name,de);
+
+		if ((ix = p->match(p, &de, Lab, NULL, 2)) < 0)
+			error(" match failed with '%s'\n",p->err);
+		printf("Matched color '%s' with DE00 %f\n",p->data[ix].name,de);
+	}
+	
+#ifdef NEVER
+	printf("Loaded %d colors\n",p->count);
+	for (i = 0; i < p->count; i++) {
+		printf("Color %d name '%s' = %f %f %f\n",
+		       i, p->data[i].name, p->data[i].Lab[0], p->data[i].Lab[1], p->data[i].Lab[2]);
+		if (p->data[i].devSig != icMaxEnumData) {
+			printf("%s = %s\n", icm2str(icmColorSpaceSignature, p->data[i].devSig),
+			             icmPdv(p->data[i].dev_n, p->data[i].dev));
+		}
+	}
+#endif
+	p->del(p);
+
+	return 0;
+}
+
+
+
+#endif /* STANDALONE_TEST */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/namedc/namedc.h b/namedc/namedc.h
new file mode 100644
index 0000000..cc8917d
--- /dev/null
+++ b/namedc/namedc.h
@@ -0,0 +1,156 @@
+#ifndef NAMEDC_H
+#define NAMEDC_H
+
+/* 
+ * Argyll Color Correction System
+ * Named color set support.
+ *
+ * Author: Graeme W. Gill
+ * Date:   3/12/2013
+ *
+ * Copyright 2013 Graeme W. Gill
+ * All rights reserved.
+ *
+ * This material is licenced under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3 :-
+ * see the License2.txt file for licencing details.
+ *
+ */
+
+/*
+ * This class provides storage for a list of named colors
+ * in a file format independent fashiom.
+ *
+ * Currently these are all assumed to be reflective colors.
+ *
+ * Current implementation is read only, but it could be converted
+ * to support creating and writing too.
+ *
+ */
+
+/* ------------------------------------------------------------------------------ */
+
+/* An individual named color */
+
+struct _nce {
+	char *name;				/* Name in ASCII/UTF-8 */
+
+	double Lab[3];			/* D50 L*a*b* */
+	int Lab_v;				/* nz if Lab is valid */
+	
+	xspect *sp;				/* Non-NULL if valid spectral reflectance, norm 100% */
+
+	icColorSpaceSignature devSig;	/* Device colorspace signature, icMaxEnumData if invalid */
+	int dev_n;				/* Number of channels */
+	double dev[MAX_CHAN];	/* Optional device values, ie CMYK in % */
+
+}; typedef struct _nce nce;
+
+
+struct _namedc {
+
+	char *creator;		/* Creator name in ASCII/UTF-8 */
+	char *description;	/* Description in ASCII/UTF-8 */
+
+	int hash;			/* hash of filename and description */
+
+	icxIllumeType ill;		/* Illuminant values was measured under */
+	icxObserverType obs;	/* Observer model */
+
+    unsigned int count;		/* Count of named colors */
+    unsigned int count_a;	/* Allocated number of colors */
+    nce  *data;				/* Array of [count] color values */
+
+  /* Public: */
+	void (*del)(struct _namedc *p);
+
+#define NAMEDC_OP_NONE   0x0000
+#define NAMEDC_OP_NODATA 0x0001			/* Don't load any data, just description */
+#define NAMEDC_OP_NOSPEC 0x0002			/* Don't load spectral data */
+
+	/* Read a cxf 3 format named color file */
+	/* return nz on error */
+	int (*read_cxf)(struct _namedc *p, const char *filename, int options);
+
+	/* Read an ICC format named color file */
+	/* return nz on error */
+	int (*read_icc)(struct _namedc *p, const char *filename, int options);
+
+	/* Read any format named color files */
+	int (*read)(struct _namedc *p, const char *filename, int options);
+
+	/* Return the index of the best mataching color, -1 on error. */
+	/* Lab[] is assumed to be D50, 2 degree standard observer based CIE value, */
+	/* and the spec value should only be provided if this is a reflective or */
+	/* transmissive measurement, NULL if emissive. */
+	/* If named color library is expects other than D50, 2 degree, then */
+	/* it will use the spectral value if not NULL, or chromatically */
+	/* adapt the Lab value. */
+	/* deType == 0 DE76 */
+	/* deType == 1 DE94 */
+	/* deType == 2 DE2000 */
+	/* if de != NULL, return the delta E */
+	int (*match)(struct _namedc *p, double *de, double *Lab, xspect *spect, int deType);
+
+	/* Houskeeping - should switch this to a1log ? */
+#define NAMEDC_ERRL 1000
+	int errc;				/* Error code */
+	char err[NAMEDC_ERRL];	/* Error message */
+
+  /* Private: */
+	a1log *log;
+	char *filename;			/* So we can lazy read the colors */
+	int format;				/* 0 = unknown, 1 = cxf, 2 = ICC */
+	int options;
+	int indata;				/* State flag for sax_cb() */
+
+	char pfx[100];			/* Prefix to apply */
+#define NAMEDC_PLEN 500
+	char prefix[NAMEDC_PLEN];	/* Temporary buffers to use */
+
+	/* Color conversions */
+	xsp2cie *sp2cie;		/* Reflectance or Transmittance to this namedc space */
+	double chrom[3][3];		/* Chromatic transform to this namedc space */
+	icmXYZNumber dXYZ;		/* Named color white point */
+
+}; typedef struct _namedc namedc;
+
+/* Create a new, uninitialised namedc */
+namedc *new_namedc(a1log *log);
+
+#endif /* NAMEDC_H */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/namedc/txt2iccnc.c b/namedc/txt2iccnc.c
new file mode 100644
index 0000000..3ea1bc9
--- /dev/null
+++ b/namedc/txt2iccnc.c
@@ -0,0 +1,273 @@
+
+/* 
+ * Argyll Color Correction System
+ * x11 style .txt to ICC Named Color converter
+ *
+ * Author: Graeme W. Gill
+ * Date:   24/20/2014
+ *
+ * Copyright 2014 Graeme W. Gill
+ * All rights reserved.
+ *
+ * This material is licenced under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3 :-
+ * see the License.txt file for licencing details.
+ */
+
+/*
+ * TTBD
+ */
+
+#undef DEBUG
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <sys/types.h>
+#include <time.h>
+#include "copyright.h"
+#include "aconfig.h"
+#ifndef SALONEINSTLIB
+#include "numlib.h"
+#include "icc.h"
+#else
+#include "numsup.h"
+#endif
+#include "xspect.h"
+#include "ui.h"
+
+void usage(char *diag, ...) {
+	fprintf(stderr,"x11 .txt to ICC Named Colors\n");
+	fprintf(stderr,"Author: Graeme W. Gill\n");
+	if (diag != NULL) {
+		va_list args;
+		fprintf(stderr,"  Diagnostic: ");
+		va_start(args, diag);
+		vfprintf(stderr, diag, args);
+		va_end(args);
+		fprintf(stderr,"\n");
+	}
+	fprintf(stderr,"usage: txt2iccNC [-v level] description infile outfile\n");
+	exit(1);
+}
+
+int
+main(int argc, char *argv[]) {
+	int fa,nfa;				/* argument we're looking at */
+	int verb = 0;
+	char desc[MAXNAMEL+1];
+	char inname[MAXNAMEL+1];
+	char outname[MAXNAMEL+1];
+	FILE *ifp;
+#define BUFSZ 512
+	char buf[BUFSZ];
+	icmFile *wr_fp;
+	icc *wr_icco;
+	int i, rv;
+
+	/* Process the arguments */
+	for(fa = 1;fa < argc;fa++) {
+		nfa = fa;					/* skip to nfa if next argument is used */
+		if (argv[fa][0] == '-')	{	/* Look for any flags */
+			char *na = NULL;		/* next argument after flag, null if none */
+
+			if (argv[fa][2] != '\000')
+				na = &argv[fa][2];		/* next is directly after flag */
+			else {
+				if ((fa+1) < argc) {
+					if (argv[fa+1][0] != '-') {
+						nfa = fa + 1;
+						na = argv[nfa];		/* next is seperate non-flag argument */
+					}
+				}
+			}
+
+			if (argv[fa][1] == '?')
+				usage(NULL);
+
+			else if (argv[fa][1] == 'v')
+				verb = 1;
+
+			else 
+				usage("Unknown option '%c'",argv[fa][1]);
+		}
+		else
+			break;
+	}
+
+	if (fa >= argc || argv[fa][0] == '-') usage("Missing description");
+	strncpy(desc,argv[fa++],MAXNAMEL); desc[MAXNAMEL] = '\000';
+
+	if (fa >= argc || argv[fa][0] == '-') usage("Missing input filename");
+	strncpy(inname,argv[fa++],MAXNAMEL); inname[MAXNAMEL] = '\000';
+
+	if (fa >= argc || argv[fa][0] == '-') usage("Missing output filename");
+	strncpy(outname,argv[fa++],MAXNAMEL); outname[MAXNAMEL] = '\000';
+
+	if ((ifp = fopen(inname,"r"))==NULL) {
+		error("Read: Can't open file '%s'",inname);
+	}
+
+	/* Open up the file for writing */
+	if ((wr_fp = new_icmFileStd_name(outname,"w")) == NULL)
+		error ("Write: Can't open file '%s'",outname);
+
+	if ((wr_icco = new_icc()) == NULL)
+		error ("Write: Creation of ICC object failed");
+
+	/* Values that must be set before writing */
+	wr_icco->header->deviceClass     = icSigNamedColorClass;
+   	wr_icco->header->colorSpace      = icSigRgbData;
+   	wr_icco->header->pcs             = icSigLabData;
+   	wr_icco->header->renderingIntent = icRelativeColorimetric;
+
+	/* Add the description tag */
+	{
+		icmTextDescription *wo;
+		if ((wo = (icmTextDescription *)wr_icco->add_tag(
+		           wr_icco, icSigProfileDescriptionTag,	icSigTextDescriptionType)) == NULL) 
+			error("Failed to add icmTextDescription");
+	
+		wo->size = strlen(desc)+1; 	/* Allocated and used size of desc, inc null */
+		wo->allocate((icmBase *)wo);/* Allocate space */
+		strcpy(wo->desc, desc);		/* Copy the string in */
+	}
+
+	/* Copyright Tag: */
+	{
+		icmText *wo;
+		char *crt;
+
+		crt = "";
+
+		if ((wo = (icmText *)wr_icco->add_tag(
+		           wr_icco, icSigCopyrightTag,	icSigTextType)) == NULL) 
+			error("add_tag failed: %d, %s",wr_icco->errc,wr_icco->err);
+
+		wo->size = strlen(crt)+1; 	/* Allocated and used size of text, inc null */
+		wo->allocate((icmBase *)wo);/* Allocate space */
+		strcpy(wo->data, crt);		/* Copy the text in */
+	}
+
+	/* White Point Tag: */
+	/* Use the orgininal, non PCS adapted white point */
+	{
+		icmXYZArray *wo;
+		/* Note that tag types icSigXYZType and icSigXYZArrayType are identical */
+		if ((wo = (icmXYZArray *)wr_icco->add_tag(
+		           wr_icco, icSigMediaWhitePointTag, icSigXYZArrayType)) == NULL) 
+			error("add_tag failed: %d, %s",wr_icco->errc,wr_icco->err);
+
+		wo->size = 1;
+		wo->allocate((icmBase *)wo);	/* Allocate space */
+		wo->data[0] = icmD65;			/* sRGB is D65 */
+	}
+
+	/* Add a named color tag */
+	{
+		icmNamedColor *wo;
+
+		if ((wo = (icmNamedColor *)wr_icco->add_tag(
+	           wr_icco, icSigNamedColor2Tag, icSigNamedColor2Type)) == NULL) 
+			error("Adding icmNamedColor tag failed");
+	
+	   	wo->count = 0;	
+	
+		/* Read lines and count the colors */
+		for (;;) {
+			double rgb[3];
+			char s1[BUFSZ];
+			char s2[BUFSZ];
+			char s3[BUFSZ];
+			
+			if (fgets(buf, BUFSZ, ifp) == NULL)
+				break;
+	
+			if ((rv = sscanf(buf, " %lf %lf %lf %s %s %s\n",&rgb[0], &rgb[1], &rgb[2], s1, s2, s3)) >= 4) {
+				wo->count++;
+			}
+		}
+	
+	   	wo->nDeviceCoords =	3;	/* Num of device coordinates */
+		strcpy(wo->prefix,""); /* Prefix for each color name, max 32, null terminated */
+		strcpy(wo->suffix,""); /* Suffix for each color name, max 32, null terminated */
+	
+		wo->allocate((icmBase *)wo);	/* Allocate named color structures */
+	
+		if (verb)
+			printf("Counted %d colors\n",wo->count);
+
+		/* Read lines and colors */
+		rewind(ifp);
+		for (i = 0; i < wo->count; i++) {
+			double rgb[3], lab[3];
+			char s1[BUFSZ];
+			char s2[BUFSZ];
+			char s3[BUFSZ];
+			unsigned int j;
+			
+			if (fgets(buf, BUFSZ, ifp) == NULL)
+				break;
+	
+			if ((rv = sscanf(buf, " %lf %lf %lf %s %s %s\n",&rgb[0], &rgb[1], &rgb[2], s1, s2, s3)) >= 4) {
+				rgb[0] /= 255.0;
+				rgb[1] /= 255.0;
+				rgb[2] /= 255.0;
+				if (rv >= 5) {
+					strcat(s1, " ");
+					strcat(s1, s2);
+				}
+				if (rv >= 6) {
+					strcat(s1, " ");
+					strcat(s1, s3);
+				}
+				/* Convert from sRGB to Bradford adapted D50 */
+				icx_sRGB2XYZ(lab, icmD50_ary3, rgb);
+				icmXYZ2Lab(&icmD50, lab, lab);
+	
+				if (verb)
+					printf("Got %f %f %f '%s'\n",rgb[0], rgb[1], rgb[2], s1);
+	
+				strncpy(wo->data[i].root,s1,31);
+				wo->data[i].root[31] = '\000';
+	
+				for (j = 0; j < wo->nDeviceCoords; j++)
+					wo->data[i].deviceCoords[j] = rgb[j];
+				for (j = 0; j < 3; j++)
+					wo->data[i].pcsCoords[j] = lab[j];
+			}
+		}
+		fclose(ifp);
+	}
+
+	if ((rv = wr_icco->write(wr_icco, wr_fp, 0)) != 0)
+		error ("Write file: %d, %s",rv,wr_icco->err);
+
+	wr_icco->del(wr_icco);
+	wr_fp->del(wr_fp);
+
+	return 0;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+