Move things round a bit.

diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..d60c31a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+                   GNU GENERAL PUBLIC LICENSE
+                      Version 2, June 1991
+
+ Copyright (C) 1989, 1991 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.
+
+                           Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+\f
+                   GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+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 fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+\f
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+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 Program, 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 it.
+
+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 Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) 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; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, 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 executable.  However, as a
+special exception, the source code 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.
+
+If distribution of executable or 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 counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+\f
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program 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.
+
+  5. 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 Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program 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 to
+this License.
+
+  7. 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 Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program 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 Program.
+
+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.
+\f
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program 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.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 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 Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, 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.
+
+                           NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+                    END OF TERMS AND CONDITIONS
+\f
+           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
+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 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 General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; 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.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

diff --git a/ChangeLog b/ChangeLog
new file mode 100644 (file)
index 0000000..d864d8a
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,90 @@
+2012-07-15  Carl Hetherington  <cth@carlh.net>
+
+       * Remove code to use `standard' format DCP long names,
+       as in the wild their use seems to be decreasing, and it
+       makes the GUI simpler.
+
+       * Fix some bugs with sending to servomatic introduced
+       in the adjustments to padding.
+
+2012-07-14  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.25 released.
+
+2012-07-14  Carl Hetherington  <cth@carlh.net>
+
+       * Various GUI cleanups.
+
+       * Remove player from the GUI for now.
+
+       * Fix hash down the left-hand side of encoded DCPs.
+
+       * Add option to black-out the end of an encode, in order
+       to remove unwanted frames of video whilst keeping sound.
+
+       * Fixes to copy-to-server.
+
+       * Fix name of 16:9 format.
+
+2012-07-08  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.24 released.
+
+2012-07-08  Carl Hetherington  <cth@carlh.net>
+
+       * Add support for generating static DCPs from single
+       image files.
+
+       * Add option to copy DCP to a remote server (e.g. a TMS)
+       via SCP.
+
+       * Auto-update thumbs when content changes.
+
+2012-06-10  Carl Hetherington  <cth@carlh.net>
+
+       * Fix up bad padding setup when there isn't any.
+
+       * Restore sound to playomatic; add assert for bad format.
+
+2012-05-26  Carl Hetherington  <cth@carlh.net>
+
+       * Fix crash on attempting to use a non-existant filter.
+
+       * src/lib/filter.cc: Fix typo in filter name.
+
+       * Allow configuration of the reference scalers and filters in A/B mode.
+
+       * Fix identification of formats in metadata.
+
+2012-05-26  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.23 released.
+
+2012-05-28  Carl Hetherington  <cth@carlh.net>
+
+       * src/lib/player_manager.cc: possible fix to crash when stopping
+       playback.
+
+       * Fix crash in A/B mode.
+
+2012-05-26  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.21 released.
+
+2012-05-25  Carl Hetherington  <cth@carlh.net>
+
+       * Add option to delay audio with respect to video.
+
+       * src/tools/fixlengths.cc: add a few more options.
+
+2012-05-22  Carl Hetherington  <cth@carlh.net>
+
+       * src/tools/dvdomatic.cc: fix website address.
+
+       * test: fix up a few test bits.
+
+       * README: very brief introduction to a few things.
+
+2012-05-22  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.20 released.

diff --git a/Doxyfile b/Doxyfile
new file mode 100644 (file)
index 0000000..8efb706
--- /dev/null
+++ b/Doxyfile
@@ -0,0 +1,1716 @@
+# Doxyfile 1.7.4
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = DVD-o-matic
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = build/doc
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. The create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = src doc/mainpage.txt
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is adviced to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the stylesheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES       = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the
+# mathjax.org site, so you can quickly see the result without installing
+# MathJax, but it is strongly recommended to install a local copy of MathJax
+# before deployment.
+
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will write a font called Helvetica to the output
+# directory and reference it in all dot files that doxygen generates.
+# When you want a differently looking font you can specify the font name
+# using DOT_FONTNAME. You need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..26b857b
--- /dev/null
+++ b/README
@@ -0,0 +1,82 @@
+dvd-o-matic
+-----------
+
+Hello!
+
+
+Building
+--------
+
+./waf configure
+./waf
+sudo ./waf install
+
+
+Dependencies
+------------
+
+You will need these libraries:
+
+    FFmpeg
+    libtiff
+    boost thread and filesystem
+    libopenjpeg
+
+and also the command line tools:
+
+    opendcp_mxf and opendcp_xml (from OpenDCP http://code.google.com/p/opendcp/)
+    vobcopy (if you want to rip DVDs straight into DVD-o-matic)
+
+
+In a nutshell
+-------------
+
+The `dvdomatic' program is a GTK front-end which is probably easiest
+to use.  It will create a directory for a particular project, and write
+its data to that directory.  The basic approach is:
+
+"File->New"; specify a directory.
+Choose "Jobs->Copy from DVD" to read a DVD from your drive, if you have one.
+Fill in the fields in the window (most importantly the `content' field:
+  specify your video, and the `Name' field: give your project [and hence DCP]
+  a name.)
+Move the slider to see thumbnails; adjust crop if necessary.
+Click "Make DCP" and go and make a really strong cup of tea.
+The DCP will be written to the project's directory; copy this to your
+  media server and ingest.
+
+The `Format' field dictates what size your image will be:
+
+- 4:3 within Flat: 1.33:1 images inside a flat (1.85:1) frame; play
+  back using the DCI 1.85 / DCI Flat preset on your projector.
+- Academy: 1.37:1; play using DCI 1.37 if you have such a thing.
+- 16:9 within Flat: 1.78:1 images inside a 1.85:1 frame.
+- Flat: 1.85:1 images to the DCI spec.
+- Scope: 2.39:1 images to the DCI spec.
+
+
+
+Server/client
+-------------
+
+Running the `servomatic' program on a remote machine will make it
+listen on port 6192 (by default) and process requests from a dvdomatic
+instance.  This has been written with no thought to security, so don't
+do it over the public internet!  The connection will probably need to
+be 1 Gb/s to make it worthwhile.
+
+To tell the client about available servers you will need to go to
+Edit->Preferences and add the server's IP address and the number of
+parallel threads that the server should execute (make it equal to the
+number of CPUs or cores).
+
+
+
+Problems
+--------
+
+Email me at cth@carlh.net in the first instance.
+
+
+Carl Hetherington
+July 2012

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..042b761
--- /dev/null
+++ b/TODO
@@ -0,0 +1,108 @@
+Don't start without opendcp tools on path
+Sort out fight between Job::status and overridden versions; a bit ugly
+Format name in ~/.dvdomatic screws up with spaces; use ID or something
+Thumbnails are poorly named
+x-thread signaller
+Restartable jobs somehow
+More logging
+Nice error when trying to thumbnail with no content.
+Destroy _buffer_src_context / _buffer_sink_context
+Don't start later jobs when one breaks.
+Compute time remaining based on more recent information.
+Start frame later than ... error?
+Use lexical_cast more
+Do deps better
+
+options summary
+
+1: L
+2: R
+3: C
+4: Lfe
+5: Ls
+6: Rs
+
+City Screen
+
+Screen 1: "1.37" masking preset, projector only has DCI 133 preset.
+
+With 1480x1080 alignment in DCI 133: bottom you see purple, yellow; top purple; left and right no lines
+With 1480x1080 alignment in DCI Flat: outside masks, but you see bottom purple, yellow; left/right all; top purple
+
+
+Screen 2: no real masking preset, projector has DCI 133 and DCI 137
+
+1480x1080, DCI 133
+L yellow purple
+R none
+B purple
+T none
+1480x1080, DCI 137
+L all
+R all but blue
+T purple
+B purple
+
+
+Screen 3: projector has DCI 1.38
+
+1480x1080
+L, R, T none
+B purple + yellow
+
+
+films-0.6: Dolby Countdown looks as though it's 3D.  THX Terminator 2 fucked
+(these on default settings)
+fq/gradfun --- no obvious effect
+hqdn3d --- pretty good denoising
+ow --- no obvious effect
+tn --- interesting; much noise reduction, bad artefacts on movement, colour tint even in black
+unsharp --- worse
+
+Benchmark SWS options: lanczos ?
+hqdn3d=0:0:6 ? (turn off chroma/luma blurring)
+
+Lanczos; no visible effect on Ghostbusters.
+
+
+THX_Monster with master Intel Core 2 Duo E4600 (2.4GHz), slave Intel Core i3 M350 (2.27GHz)
+1920 x 1080 original -> DCI Flat
+240 frames
+
+[Gbit: gigabit ethernet rather than 100Mbit]
+[im-mod: after modification to memcpy RGB data then to RGB -> XYZ in the encode thread
+[hack1]: after modification to pass YUV and to swscale in the encode thread (includes im-mod)
+[hack2]: modified hack1
+                               Time            Seconds         FPS             Speedup relative to 1 local
+1 local:                               20m57           1257            0.19            x 1     
+2 local:                       11m24            684            0.35            x 1.84
+2 local [im-mod]:              13m13
+2 local + 1 slave:             6m34             394            0.61            x 3.19
+2 local + 2 slave:             5m13             313            0.77            x 4.02
+2 local + 4 slave:             5m05             303            0.79            x 4.15
+2 local + 4 slave [Gbit]:      2m50             170            1.41            x 7.39
+2 local + 4 slave [Gbit,im-mod]:2m33
+2 local + 4 slave [Gbit,hack1]: 3m20
+2 local + 4 slave [Gbit,hack2]: 2m22
+1 local + 8 slave [Gbit]:      2m28             148            1.62            x 8.49
+2 local + 8 slave [Gbit]:      2m41             161            1.49            x 7.81
+2 local + 8 slave [Gbit,im-mod]:2m35
+
+
+
+Just encode 52s
+Encode + Image create 1m27
+Encode + Image create (memcpy, not convert) 53s.
+
+THX_Monster with master Intel Core i3 M350 (2.27GHz), slave Intel Core 2 Duo E4600 (2.4GHz)
+1920 x 1080 original -> DCI Flat
+240 frames
+
+
+4 local:                       2m45
+4 local [im-mod]:              2m53
+4 local + 2 slave [Gbit]:      2m22
+4 local + 4 slave [Gbit]:      2m21
+4 local + 4 slave [Gbit,in-mod]:2m21
+
+

diff --git a/doc/mainpage.txt b/doc/mainpage.txt
new file mode 100644 (file)
index 0000000..a944238
--- /dev/null
+++ b/doc/mainpage.txt
@@ -0,0 +1,37 @@
+/** @mainpage DVD-o-matic
+ *
+ *  DVD-o-matic is a tool to create digital cinema packages (DCPs) from
+ *  video files, or from sets of TIFF image files.  It is written in C++
+ *  and distributed under the GPL.
+ *
+ *  Video files are decoded using FFmpeg (http://ffmpeg.org), so any video
+ *  supported by FFmpeg should be usable with DVD-o-matic.  Most testing has, however,
+ *  happened with files from DVD.  DVD-o-matic's output has been tested on Christie
+ *  digital projectors with Doremi servers.
+ *
+ *  DVD-o-matic allows you to crop black borders from movies, scale them to the correct
+ *  aspect ratio and apply FFmpeg filters.  The time-consuming encoding of JPEG2000 files
+ *  can be parallelised amongst any number of processors on the local host and any number
+ *  of servers over a network.
+ * 
+ *  Portions of DVD-o-matic are based on OpenDCP (http://code.google.com/p/opendcp),
+ *  written by Terrence Meiczinger, and two of OpenDCP's command-line tools are called
+ *  by DVD-o-matic.
+ *
+ *  DVD-o-matic uses libopenjpeg (http://code.google.com/p/openjpeg/) for JPEG2000 encoding
+ *  and libsndfile (http://www.mega-nerd.com/libsndfile/) for WAV file manipulation.  It
+ *  also makes heavy use of the boost libraries (http://www.boost.org/).  libtiff
+ *  (http://www.libtiff.org/) is used for TIFF encoding and decoding, and the GUI is
+ *  built using GTK (http://www.gtk.org/) and GTKMM (http://www.gtkmm.org).  It also uses libmhash (http://mhash.sourceforge.net/)
+ *  for debugging purposes.
+ *
+ *  Thanks are due to the authors and communities of all DVD-o-matic's dependencies.
+ * 
+ *  DVD-o-matic is distributed in the hope that there are still cinemas with projectionists
+ *  who might want to use it.  As Mark Kermode says, "if it doesn't have a projectionist
+ *  it's not a cinema - it's a sweetshop with a video-screen."
+ *
+ *  Email correspondance is welcome to cth@carlh.net
+ *
+ *  More details can be found at http://carlh.net/dvdomatic
+ */

diff --git a/dvdomatic.desktop.in b/dvdomatic.desktop.in
new file mode 100644 (file)
index 0000000..65067eb
--- /dev/null
+++ b/dvdomatic.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@PREFIX@/bin/dvdomatic
+Name=DVD-o-matic
+Icon=dvdomatic
+Comment=DCP generator
+Categories=AudioVideo;Video

diff --git a/icons/128x128/dvdomatic.png b/icons/128x128/dvdomatic.png
new file mode 100644 (file)
index 0000000..9936b39
Binary files /dev/null and b/icons/128x128/dvdomatic.png differ

diff --git a/icons/22x22/dvdomatic.png b/icons/22x22/dvdomatic.png
new file mode 100644 (file)
index 0000000..dddb862
Binary files /dev/null and b/icons/22x22/dvdomatic.png differ

diff --git a/icons/32x32/dvdomatic.png b/icons/32x32/dvdomatic.png
new file mode 100644 (file)
index 0000000..8cecf08
Binary files /dev/null and b/icons/32x32/dvdomatic.png differ

diff --git a/icons/48x48/dvdomatic.png b/icons/48x48/dvdomatic.png
new file mode 100644 (file)
index 0000000..07bf2d1
Binary files /dev/null and b/icons/48x48/dvdomatic.png differ

diff --git a/icons/64x64/dvdomatic.png b/icons/64x64/dvdomatic.png
new file mode 100644 (file)
index 0000000..35564a8
Binary files /dev/null and b/icons/64x64/dvdomatic.png differ

diff --git a/icons/finish-trace.svg b/icons/finish-trace.svg
new file mode 100644 (file)
index 0000000..ef10952
--- /dev/null
+++ b/icons/finish-trace.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.175"
+     inkscape:cx="375"
+     inkscape:cy="520"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="714"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3105"
+       transform="translate(-1868.5714,-120)">
+      <path
+         style="fill:#9a8e8c"
+         d="m -231,458.0765 0,-508.500004 711,0 711,0 0,508.500004 0,508.5 -711,0 -711,0 0,-508.5 z"
+         id="path3137"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#928177"
+         d="m -213.32982,957.3265 c -0.34376,-5.0875 -0.22187,-10.98492 0.27086,-13.10539 0.61915,-2.66452 0.50223,-4.98115 -0.37853,-7.5 -0.89576,-2.56171 -1.12841,-7.60366 -0.78304,-16.96926 0.33809,-9.16785 0.10301,-14.5014 -0.75353,-17.09674 -1.04047,-3.15268 -0.96024,-5.20664 0.48857,-12.50794 1.51393,-7.62942 1.58249,-10.0869 0.54133,-19.40326 -1.58255,-14.16082 -1.65976,-23.30687 -0.31376,-37.16741 0.72403,-7.45586 0.79889,-13.96165 0.21287,-18.5 -0.49714,-3.85 -1.1624,-22.3 -1.47835,-41 -0.31594,-18.7 -0.82082,-44.35 -1.12193,-57 -0.30112,-12.65 -0.52324,-25.475 -0.4936,-28.5 0.0296,-3.025 0.002,-9.325 -0.0622,-14 -0.14309,-10.48045 -0.1387,-24.05686 0.0185,-57 0.0669,-14.025 -0.1265,-30.45 -0.42979,-36.5 -0.67582,-13.48114 -0.60566,-48.5084 0.12372,-61.77029 0.32731,-5.95118 0.12891,-10.53349 -0.50756,-11.72274 -0.69588,-1.30026 -0.75692,-5.21843 -0.18272,-11.72971 0.47421,-5.37749 0.55092,-13.60226 0.17046,-18.27726 -0.38045,-4.675 -0.2795,-9.69634 0.22434,-11.15853 0.59337,-1.72205 0.46982,-5.42076 -0.35076,-10.5 -0.85991,-5.32274 -1.16455,-16.19285 -0.9484,-33.84147 0.17513,-14.3 0.32898,-27.125 0.34187,-28.5 0.0129,-1.375 -0.31829,-9.25 -0.73598,-17.5 -0.44693,-8.82769 -0.36743,-17.09395 0.19319,-20.08874 0.64872,-3.46535 0.59977,-6.33649 -0.15343,-9 -0.78209,-2.76565 -0.83926,-9.62283 -0.19519,-23.41126 0.67501,-14.45091 0.58844,-21.85718 -0.33434,-28.60361 -0.86796,-6.34571 -0.9858,-12.40463 -0.38898,-20 0.47091,-5.99302 0.76497,-12.02139 0.65348,-13.39639 -0.1115,-1.375 -0.43483,-9.025 -0.71851,-17 -0.28367,-7.975 -0.98884,-17.42336 -1.56702,-20.99637 -0.70698,-4.36884 -0.72826,-8.13502 -0.065,-11.5 1.17383,-5.95527 1.32789,-15.67437 0.5073,-32.00363 -0.86661,-17.24498 -0.78219,-21.97571 0.45926,-25.73737 0.6363,-1.928 1.02563,-9.44144 0.92233,-17.79947 -0.14298,-11.56849 -0.52082,-15.06358 -1.88784,-17.46316 -1.27288,-2.23434 -1.88407,-6.61684 -2.39476,-17.17142 -0.59707,-12.340104 -0.46285,-14.601564 1.03868,-17.500004 1.9704,-3.80352 2.11736,-9.29476 0.51729,-19.32858 -0.81425,-5.10606 -0.81824,-7.72875 -0.0147,-9.69345 0.78082,-1.90928 0.81236,-5.40294 0.10833,-11.999996 -0.54625,-5.118605 -0.76091,-11.639299 -0.47702,-14.490431 0.2839,-2.851133 -0.0115,-6.676133 -0.65649,-8.5 -1.80371,-5.100636 -2.46694,-31.906609 -0.97513,-39.411895 0.94622,-4.760439 0.98128,-7.250088 0.14236,-10.109979 -0.61216,-2.086837 -1.4885,-7.731749 -1.94744,-12.544249 l -0.83443,-8.75 16.3442,0 c 16.96243,0 19.20135,0.516382 19.20135,4.428571 0,0.864286 0.45,1.571429 1,1.571429 0.55,0 1,-0.707143 1,-1.571429 0,-3.502911 2.57456,-4.428571 12.31728,-4.428571 l 9.46014,0 0.66646,3.552557 c 0.36656,1.953906 1.32237,3.80425 2.12403,4.111875 1.75967,0.675248 4.43209,-1.349714 4.43209,-3.358305 0,-2.472165 2.70241,-4.306127 6.34524,-4.306127 1.91845,0 3.71507,0.5625 3.99248,1.25 0.40351,1 0.52017,1 0.58333,0 0.0916,-1.449572 7.07895,-1.762855 7.07895,-0.317388 0,0.512937 0.93356,1.228912 2.07457,1.591055 2.82234,0.895776 5.92543,8.509711 5.92543,14.539002 0,4.596371 2.439,12.829971 3.85858,13.025826 4.82536,0.665742 11.4777,0.198737 11.87383,-0.833561 0.26486,-0.690213 1.97628,-1.254934 3.80315,-1.254934 1.82687,0 3.99658,-0.675 4.82158,-1.5 0.825,-0.825 2.48029,-1.5 3.67842,-1.5 1.57559,0 2.01045,-0.437724 1.57143,-1.581787 -0.33385,-0.869984 -0.60699,-2.219984 -0.60699,-3 0,-0.780017 -0.675,-1.418213 -1.5,-1.418213 -0.94369,0 -1.5,0.951825 -1.5,2.566422 0,2.209776 -0.38216,2.522451 -2.75,2.25 -2.05272,-0.236191 -2.83839,-0.943146 -3.09861,-2.788162 -0.19173,-1.359456 -0.97923,-3.372084 -1.75,-4.472506 C -117.4888,-35.138681 -118,-38.523184 -118,-43.14601 l 0,-7.277494 9.57143,0 c 9.85849,0 12.42857,0.915777 12.42857,4.428571 0,0.864286 0.64913,1.571429 1.4425,1.571429 0.98216,0 1.54064,1.356293 1.75,4.25 0.41892,5.789951 3.1815,5.960702 3.60411,0.222764 0.277,-3.760845 0.62427,-4.17755 5.25,-6.299647 2.72437,-1.249826 4.95339,-2.70007 4.95339,-3.222764 0,-0.547589 5.07758,-0.950353 11.98095,-0.950353 l 11.98095,0 0.64679,2.577047 c 0.35574,1.417375 0.10499,3.589428 -0.55722,4.826784 -1.74392,3.258543 -0.95501,8.680438 1.44853,9.955246 1.1,0.583427 3.28991,1.91853 4.86647,2.966896 2.02029,1.343433 3.95549,1.760053 6.55556,1.411311 6.36611,-0.853876 9.91759,4.438948 4.62501,6.892748 -2.22932,1.033582 -2.46337,0.905555 -2.74219,-1.5 -0.2158,-1.86175 -0.88909,-2.630032 -2.30485,-2.630032 -2.75103,0 -3.44451,5.224376 -0.81697,6.154698 0.99933,0.35383 2.79616,1.523417 3.99294,2.599083 2.47515,2.224654 4.74165,1.451203 4.00477,-1.36664 -0.3109,-1.188893 0.02686,-1.887141 0.91288,-1.887141 0.77351,0 1.40638,-0.689123 1.40638,-1.531385 0,-0.842261 0.6338,-1.774596 1.40844,-2.071855 1.75879,-0.674909 4.00746,-5.914803 3.14038,-7.317764 -0.3541,-0.572945 -0.82994,-3.5976 -1.05742,-6.721456 -0.22748,-3.123856 -0.8811,-6.147243 -1.4525,-6.718639 C -31.53249,-45.355998 -32,-46.857058 -32,-48.120291 l 0,-2.296786 611.5,-0.0048 611.5,-0.0048 0,508.501597 0,508.50159 -701.8524,0 -701.8524,0 -0.62502,-9.25 z m 90.04656,-816.32388 c 1.52867,-1.52868 1.68555,-3.42612 0.28326,-3.42612 -0.55,0 -1,-0.675 -1,-1.5 0,-1.07637 -1.09907,-1.5 -3.89159,-1.5 -3.32549,0 -3.98362,0.36665 -4.5242,2.52052 -1.01572,4.04695 0.74856,6.23102 4.57921,5.6688 1.79853,-0.26397 3.84752,-1.05741 4.55332,-1.7632 z"
+         id="path3135"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#8a776f"
+         d="m -212.22632,961.8265 c -0.12448,-2.6125 -0.33972,-9.7 -0.47832,-15.75 -0.13859,-6.05 -0.32687,-12.8 -0.41838,-15 -0.0915,-2.2 -0.0799,-9.27707 0.0259,-15.72682 0.11626,-7.08995 -0.24867,-12.55076 -0.92291,-13.8106 -0.83005,-1.55095 -0.78873,-3.92213 0.16157,-9.27318 1.61545,-9.09647 1.6272,-14.94506 0.063,-31.34617 -0.84629,-8.87345 -0.944,-14.57075 -0.30013,-17.5 1.26714,-5.76484 1.56504,-19.7872 0.70838,-33.34323 -0.38232,-6.05 -0.87829,-24.275 -1.10214,-40.5 -0.22386,-16.225 -0.70576,-39.85 -1.07088,-52.5 -0.36513,-12.65 -0.63419,-25.7 -0.59792,-29 0.0363,-3.3 -0.011,-9.6 -0.10502,-14 -0.094,-4.4 -0.14324,-15.65 -0.10935,-25 0.178,-49.10758 0.14032,-57.85216 -0.29081,-67.5 -0.25807,-5.775 -0.36716,-21.75 -0.24243,-35.5 0.12474,-13.75 0.17067,-28.15 0.10208,-32 -0.0686,-3.85 -0.071,-16.45 -0.005,-28 0.14803,-26.06123 -0.0176,-31.09013 -1.1692,-35.5 -0.50674,-1.94048 -0.68504,-15.3078 -0.40015,-30 0.28261,-14.575 0.46482,-26.95 0.40491,-27.5 -0.39432,-3.61987 -1.11893,-50.26801 -0.93977,-60.5 0.58435,-33.37405 -0.71385,-99.5528 -2.10878,-107.5 -0.93987,-5.35461 -0.96072,-8.41034 -0.0887,-13 1.3271,-6.98493 1.47159,-15.31149 0.55531,-32 -0.90426,-16.46901 -0.77039,-24.02261 0.46668,-26.33409 1.65565,-3.09361 0.75875,-30.96776 -1.11544,-34.66591 -1.01248,-1.99784 -1.74173,-7.59028 -2.18301,-16.74114 -0.60846,-12.617774 -0.48056,-14.262814 1.56446,-20.122444 1.96781,-5.63838 2.08094,-6.83274 0.97168,-10.25886 -1.13497,-3.50554 -1.32154,-7.36278 -1.03402,-21.37756 0.28076,-13.684897 -0.44149,-27.248561 -1.74584,-32.786427 -0.87502,-3.715064 -1.22332,-8.009922 -0.85151,-10.5 0.34603,-2.317465 0.19785,-5.344374 -0.32929,-6.726464 -0.6197,-1.624751 -0.58589,-5.865958 0.0957,-12 0.57975,-5.21791 1.03785,-11.512109 1.01799,-13.987109 -0.0381,-4.751115 -1.97058,-20.283292 -2.89271,-23.25 -0.48536,-1.56152 0.27964,-1.75 7.1029,-1.75 l 7.64684,0 -0.66784,3.04064 c -0.4321,1.967366 -0.16026,3.820493 0.77013,5.25 1.03532,1.590712 1.38448,4.869478 1.24696,11.70936 -0.13141,6.535555 0.25184,10.389555 1.22817,12.350709 1.69315,3.401008 0.98541,20.684928 -1.32725,32.413502 -1.12995,5.730525 -1.19718,8.475204 -0.31842,13 1.50068,7.727068 2.66847,26.358909 1.77291,28.286329 -0.39679,0.85398 0.31084,4.61497 1.57518,8.37196 1.641,4.87624 2.08489,7.75574 1.55665,10.0979 -0.40643,1.80207 -0.39047,3.84037 0.0355,4.52956 1.22123,1.97599 0.9979,16.09914 -0.31298,19.7922 -0.98952,2.787714 -0.93406,3.534234 0.33429,4.500004 1.44965,1.10381 1.53114,3.386 0.23774,6.65784 -1.05882,2.67845 -1.19894,25.6254 -0.21484,35.18686 1.32604,12.88393 1.09074,19.63042 -0.7845,22.49239 -1.30834,1.99678 -1.38318,3.06833 -0.4353,6.23209 0.62959,2.10139 1.16446,6.24349 1.1886,9.20468 0.0241,2.96119 0.69237,7.18398 1.48495,9.38398 0.79257,2.2 1.44782,5.0169 1.4561,6.25979 0.008,1.24288 0.91506,3.03039 2.01506,3.97224 1.1,0.94185 2,2.2393 2,2.88322 0,0.64393 0.675,1.42979 1.5,1.74638 1.68965,0.64838 2.14721,7.63837 0.5,7.63837 -1.85047,0 -1.02024,4.67227 1.17189,6.59501 1.19455,1.04775 1.81524,1.29759 1.37933,0.55522 -0.64143,-1.09237 -0.38817,-1.13333 1.3281,-0.21481 2.24095,1.19931 2.86899,3.06458 1.03186,3.06458 -0.70164,0 -0.96834,2.13042 -0.75,5.99107 0.23388,4.13544 -0.0483,6.13898 -0.91118,6.46861 -0.6875,0.26265 -1.25,1.16667 -1.25,2.00894 0,0.84226 -0.39752,1.53138 -0.88337,1.53138 -0.48585,0 -1.10961,0.86517 -1.38614,1.92259 -0.31791,1.21569 -1.55576,2.04297 -3.36663,2.25 -2.7135,0.31022 -2.89089,0.63114 -3.37864,6.11263 -0.28312,3.18188 -0.11437,6.18563 0.375,6.675 0.48938,0.48938 0.88978,2.06728 0.88978,3.50645 0,1.43916 0.26153,2.35514 0.58117,2.0355 0.31964,-0.31964 1.27872,0.89911 2.13128,2.70833 1.54273,3.2738 1.58834,3.29087 9.55794,3.57613 l 8.00781,0.28663 1.2359,-5.31591 c 1.53046,-6.58288 1.56376,-9.43669 0.12054,-10.32865 -1.06929,-0.66085 -0.88448,-3.75235 0.73292,-12.26006 0.38452,-2.02262 0.1161,-4.29779 -0.68326,-5.79141 -1.13065,-2.11264 -1.06616,-2.884 0.4567,-5.46199 1.27918,-2.16548 1.68074,-4.56769 1.44114,-8.62122 l -0.33214,-5.61927 4.98917,-0.30421 c 5.31211,-0.3239 7.20122,-1.799 8.15854,-6.37054 0.32147,-1.53517 1.74476,-3.0789 3.6879,-4 3.60534,-1.70902 4.75735,-5.84804 2.21495,-7.95804 -0.85281,-0.70777 -1.55056,-2.2292 -1.55056,-3.38097 0,-3.02843 3.10762,-10.71251 4.08747,-10.10693 1.09822,0.67874 4.36509,-1.19936 10.10885,-5.81152 2.58298,-2.07409 6.07985,-4.04777 7.77081,-4.38597 1.69097,-0.33819 3.31668,-1.00677 3.6127,-1.48573 0.89581,-1.44945 3.61402,-0.97925 5.08245,0.87916 0.76052,0.9625 2.23314,3.34216 3.27248,5.28813 1.6867,3.15802 2.73175,3.78023 9.72748,5.79154 5.29847,1.52334 10.26762,2.21896 15.33776,2.14711 4.125,-0.0585 9.29585,0.0353 11.49077,0.20846 4.2353,0.33405 4.16605,0.42384 4.38423,-5.68524 0.14091,-3.94552 2.125,-4.87921 2.125,-1 0,1.83333 0.53333,2.5 2,2.5 1.63278,0 2,-0.66667 2,-3.63084 0,-3.6147 -0.0161,-3.62823 -3.6239,-3.04277 -5.68471,0.92251 -3.02942,-0.5255 4.39423,-2.39628 l 6.72967,-1.69591 2.42012,2.41666 c 1.83841,1.83578 2.61591,2.10809 3.23469,1.1329 0.95313,-1.50214 1.10487,-6.94346 0.25537,-9.15724 -0.50747,-1.32244 -0.88288,-1.26404 -2.68857,0.41821 -2.15444,2.00717 -6.72161,2.69635 -6.72161,1.01429 0,-0.51754 0.3526,-1.1589 0.78355,-1.42525 0.43096,-0.26634 0.60628,-2.34322 0.3896,-4.61528 -0.21667,-2.27206 -0.61722,-3.90775 -0.89011,-3.63487 -1.07159,1.0716 -2.90601,-1.90507 -2.49596,-4.05014 0.78145,-4.08788 6.72804,-6.84488 7.87795,-3.65243 1.17807,3.27063 3.8454,5.06199 7.15019,4.80202 3.56853,-0.28072 3.64449,-0.19205 2.03849,2.37957 -0.69337,1.11027 -0.8506,2.9817 -0.39793,4.73643 0.4116,1.59551 0.83415,4.84173 0.93901,7.21381 0.20196,4.56851 1.57077,6.14605 5.35521,6.17181 1.2375,0.008 2.25,0.44948 2.25,0.98013 0,0.53065 0.9292,1.46211 2.0649,2.06991 6.7695,3.62293 13.85721,1.62306 21.4535,-6.05332 l 5.8331,-5.89461 0.0344,-10.2934 c 0.0461,-13.77084 -0.89058,-18.05105 -4.54076,-20.74974 -3.18905,-2.35777 -12.15762,-3.06643 -16.84518,-1.33104 -2.75823,1.02114 -6,0.62751 -6,-0.72853 0,-0.47809 -0.88292,-0.69922 -1.96205,-0.4914 -1.68716,0.32492 -1.87981,-0.0334 -1.375,-2.55742 0.32288,-1.6144 0.1712,-2.93527 -0.33706,-2.93527 -0.50826,0 -1.5256,-1.6875 -2.26075,-3.75 -2.24922,-6.31029 -4.8452,-9.25 -8.16842,-9.25 -1.6319,0 -4.09683,-0.74024 -5.47763,-1.64497 -2.18297,-1.43034 -3.02647,-1.4747 -6.46481,-0.33994 -3.2379,1.0686 -4.66304,1.07112 -7.86647,0.0139 -2.98493,-0.98512 -6.00689,-1.05783 -12.75,-0.3068 -4.86079,0.54139 -9.32305,0.6094 -9.91612,0.15113 -0.59307,-0.45827 -2.84307,-1.19437 -5,-1.63578 -2.60626,-0.53336 -4.2528,-1.54635 -4.90882,-3.02004 -0.81968,-1.84144 -1.79481,-2.2175 -5.74996,-2.2175 -2.70635,0 -4.76287,-0.46046 -4.76287,-1.06642 0,-0.58653 -1.2375,-0.92403 -2.75,-0.75 -2.08354,0.23974 -2.75,0.85701 -2.75,2.54705 0,1.22685 -0.45,2.2473 -1,2.26765 -1.61628,0.0598 -1.80641,-7.71418 -0.4717,-19.286954 l 1.24428,-10.78867 -3.06694,-3.81639 c -2.61726,-3.25683 -2.86356,-4.02093 -1.67983,-5.21133 1.00531,-1.01098 1.6937,-6.88874 2.50098,-21.354227 0.61263,-10.977608 1.34293,-20.329918 1.6229,-20.782912 0.27996,-0.452993 -0.42669,-2.409536 -1.57033,-4.347873 -2.42926,-4.117291 -2.59498,-6.490218 -0.71301,-10.209588 0.7515,-1.485187 1.67632,-4.41149 2.05517,-6.502897 0.37886,-2.091406 1.2265,-3.96632 1.88365,-4.166477 0.65716,-0.200156 2.43233,-0.635079 3.94483,-0.966495 1.55648,-0.341054 2.75,-1.274563 2.75,-2.150911 0,-1.032137 0.59617,-1.359117 1.78822,-0.980776 0.98352,0.312158 3.55367,-0.332518 5.71144,-1.432612 2.15777,-1.100095 5.29057,-2.010907 6.96178,-2.024029 1.67121,-0.01312 4.83856,-0.450731 7.03856,-0.972468 2.58863,-0.613902 5.09591,-0.594894 7.10596,0.05387 2.05911,0.664602 3.98475,0.668367 5.71331,0.01117 1.43404,-0.545222 6.68715,-1.299298 11.67358,-1.675723 8.50265,-0.641866 9.16714,-0.855247 10.68967,-3.432683 2.47568,-4.191 7.65798,-4.671974 12.8,-1.187983 2.20962,1.497127 4.27861,3.07631 4.59778,3.509294 0.31916,0.432984 3.46916,0.520318 7,0.194076 5.34004,-0.49341 6.94392,-1.099146 9.53673,-3.601722 1.71437,-1.654704 3.73937,-4.215772 4.5,-5.691263 0.76063,-1.47549 2.42169,-4.246649 3.69124,-6.15813 2.11043,-3.177537 2.28186,-4.388215 2,-14.125067 -0.23758,-8.207674 -0.02164,-10.539113 0.94173,-10.167593 0.6875,0.265131 1.25,-0.01609 1.25,-0.624932 0,-0.808104 164.02403,-1.106989 607.5,-1.106989 l 607.50002,0 0,508.500004 0,508.5 -676.55904,0 c -450.7847,0 -676.35277,-0.3337 -675.94098,-1 0.36722,-0.5942 -0.72487,-0.9715 -2.69098,-0.9297 -2.75722,0.058 -2.97551,0.2136 -1.30902,0.9297 1.50626,0.6473 0.88909,0.8573 -2.5,0.8508 -2.475,0 -4.02869,-0.2053 -3.45264,-0.4455 0.57604,-0.2403 0.87638,-1.9014 0.66741,-3.6914 -0.27533,-2.3584 0.19346,-3.7734 1.70264,-5.1392 2.91572,-2.6386 2.73773,-5.5747 -0.33795,-5.5747 -1.85715,0 -2.56861,-0.6741 -3.05668,-2.89631 -0.34988,-1.59297 -1.51063,-3.68771 -2.57946,-4.65499 -1.06883,-0.96727 -1.94332,-2.36393 -1.94332,-3.10369 0,-0.73975 -0.87961,-1.34501 -1.95469,-1.34501 -1.48725,0 -2.0957,0.89676 -2.54437,3.75 -0.32433,2.0625 -1.08495,5.41692 -1.69028,7.4543 -0.90749,3.0543 -0.81197,4.1447 0.54437,6.2148 0.90473,1.3808 1.64497,3.3889 1.64497,4.4624 0,1.0735 0.5625,2.1788 1.25,2.4562 0.6875,0.2774 0.26406,0.5399 -0.94098,0.5834 -1.20504,0.043 -2.4691,0.5289 -2.80902,1.0789 -0.3642,0.5893 -6.34372,1 -14.55902,1 l -13.94098,0 -0.22632,-4.75 z M -163,961.5765 c 0,-1.1 -0.45,-2 -1,-2 -0.55,0 -1,0.9 -1,2 0,1.1 0.45,2 1,2 0.55,0 1,-0.9 1,-2 z m 67.5,-9.5 c 0,-1.1066 1.56351,-3.2019 3.5,-4.69052 3.25255,-2.5003 3.66446,-2.58352 5.82609,-1.17709 1.98237,1.28979 3.05471,1.32669 7.25683,0.24972 3.9976,-1.02455 4.82434,-1.59895 4.36851,-3.03514 -0.76516,-2.41079 0.82932,-5.09515 5.83023,-9.81537 3.68431,-3.47753 4.81968,-3.98476 8.96834,-4.0066 4.55818,-0.024 4.75,0.0898 4.75,2.81671 0,2.43251 0.5567,3.00851 3.86602,4 5.74205,1.72036 9.20985,1.42614 14.69683,-1.24691 6.75323,-3.28993 11.36388,-8.30968 12.10551,-13.17962 0.32793,-2.15335 1.51071,-4.92296 2.62841,-6.1547 1.98519,-2.18775 1.9891,-2.28711 0.1693,-4.29798 -1.02458,-1.13215 -1.97409,-2.81619 -2.11002,-3.74232 -0.13593,-0.92613 -0.70683,-1.83711 -1.26868,-2.02439 -0.56184,-0.18728 -2.63133,-1.43295 -4.59886,-2.76815 -3.60944,-2.44943 -9.84013,-3.28575 -10.96152,-1.47131 -0.32507,0.52598 -1.30733,0.68145 -2.18281,0.3455 -1.68836,-0.64788 -3.52028,1.67608 -4.08382,5.1807 -0.17533,1.0904 -1.65564,3.36182 -3.28957,5.04761 -1.63394,1.68579 -2.97079,3.77867 -2.97079,4.65084 0,1.57178 -2.74981,2.77906 -6.38976,2.80537 -2.28295,0.0165 -4.53488,-2.71923 -4.57844,-5.56204 -0.0175,-1.14162 -1.1568,-3.13256 -2.5318,-4.42431 -2.256,-2.1194 -2.5,-3.11685 -2.5,-10.21977 0,-7.06255 -0.25682,-8.12796 -2.5,-10.37114 -1.375,-1.375 -2.5,-2.95987 -2.5,-3.52193 0,-0.56207 -0.7875,-0.78294 -1.75,-0.49084 -0.9625,0.29211 -5.12361,0.82592 -9.24691,1.18626 -5.69278,0.4975 -8.14529,1.20073 -10.19118,2.92223 -1.67314,1.40785 -3.7588,2.17267 -5.50308,2.01799 -4.97264,-0.44098 -9.23415,-1.72789 -10.40885,-3.14331 -1.49713,-1.80394 -3.348,-1.74951 -4.92004,0.14468 -0.69572,0.83829 -1.49691,1.29219 -1.78043,1.00867 -0.28352,-0.28352 -1.12494,-0.01 -1.86983,0.60851 -1.52896,1.26893 -0.0724,3.85865 2.17032,3.85865 0.69031,0 1.82374,0.68516 2.51874,1.52258 1.31304,1.58212 4.89974,1.1135 6.1289,-0.80076 0.35621,-0.55474 1.57213,-0.76686 2.70205,-0.47138 1.12993,0.29549 2.21,0.0705 2.40016,-0.5 0.23071,-0.69211 1.0785,-0.64508 2.54795,0.14135 1.50027,0.80292 2.2022,2.11237 2.2022,4.10821 0,1.93388 0.69963,3.30406 2.0584,4.03126 1.54301,0.82579 1.98119,1.89874 1.75,4.28518 -0.26764,2.76275 -0.72609,3.22409 -3.4684,3.49021 -2.61864,0.25411 -3.4677,-0.21425 -4.95606,-2.73385 -0.98784,-1.67226 -3.26398,-3.73705 -5.0581,-4.58842 -1.79411,-0.85136 -3.61388,-2.14299 -4.04393,-2.87029 -0.43005,-0.72729 -2.0718,-1.56061 -3.64833,-1.8518 -3.73626,-0.69012 -6.62264,2.11931 -6.66538,6.48771 -0.0175,1.7875 -0.6925,4.12351 -1.5,5.19113 -0.80751,1.06762 -1.4682,2.94332 -1.4682,4.16821 0,3.5692 -1.07022,5.39066 -3.16735,5.39066 -1.64575,0 -1.9045,0.59058 -1.64302,3.75 0.20457,2.47168 0.8217,3.7833 1.81037,3.84769 0.825,0.0537 2.0625,0.16622 2.75,0.25 0.79817,0.0973 1.25,1.8266 1.25,4.78428 0,2.93903 0.75667,5.85628 2.07029,7.98176 1.13866,1.84239 1.78943,3.80423 1.44616,4.35965 -0.34327,0.55542 0.50465,2.13863 1.88426,3.51824 1.89167,1.89167 3.56446,2.51218 6.80384,2.52368 2.83705,0.01 3.82755,0.3117 2.91733,0.8882 -1.71565,1.0867 -0.43149,3.4293 1.47816,2.6965 0.76875,-0.295 2.41073,-0.1184 3.64885,0.3925 1.23811,0.5108 3.82611,0.834 5.75111,0.7181 2.76312,-0.1663 3.5,-0.6317 3.5,-2.2106 z M -117,905.63552 c 0,-1.68246 0.45,-3.05902 1,-3.05902 0.55,0 1,1.09844 1,2.44098 0,1.34254 -0.45,2.7191 -1,3.05902 -0.58342,0.36058 -1,-0.65628 -1,-2.44098 z m -36.43524,26.04576 c -0.79587,-1.28774 1.92801,-2.10478 7.01703,-2.10478 2.43001,0 4.41821,-0.45 4.41821,-1 0,-0.55 -1.6875,-1.01431 -3.75,-1.0318 -3.42121,-0.029 -3.58879,-0.15396 -1.91136,-1.42506 1.58888,-1.20399 1.75459,-2.3204 1.21987,-8.2182 -1.03532,-11.41921 -1.08683,-15.58636 -0.26375,-21.33385 0.76915,-5.37096 0.70021,-5.60574 -2.75293,-9.37569 -3.6573,-3.99284 -4.35805,-5.6154 -2.4252,-5.6154 0.63535,0 0.88431,-0.88839 0.57762,-2.06117 -0.32988,-1.2615 0.0128,-2.27293 0.88337,-2.60699 1.55262,-0.5958 1.84183,-3.12453 0.68622,-6.00005 -0.57442,-1.42934 -0.84905,-1.06283 -1.25,1.66821 -0.39264,2.67449 -1.04452,3.57537 -2.76384,3.81955 -1.23948,0.17603 -2.25,-0.20886 -2.25,-0.85699 0,-0.64709 0.675,-0.91752 1.5,-0.60093 1.15567,0.44347 1.5,-0.22064 1.5,-2.89301 0,-2.80195 -0.3844,-3.46862 -2,-3.46862 -1.46133,0 -2,0.66667 -2,2.47525 0,2.22706 -0.25067,2.37995 -2.5,1.52475 -3.20838,-1.21983 -7.11849,0.2226 -7.98245,2.9447 -0.50604,1.59439 -1.20259,1.92147 -3.08557,1.44887 -1.78998,-0.44925 -2.43198,-0.20252 -2.43198,0.93466 0,0.99092 -1.10401,1.65744 -3.07822,1.85841 l -3.07821,0.31336 4.82692,4.8145 c 4.64162,4.62966 4.85194,4.72564 5.47854,2.5 0.51813,-1.8404 0.67203,-1.55844 0.75129,1.37648 0.0548,2.03004 0.54968,3.9691 1.09968,4.30902 0.55,0.33992 1,1.49148 1,2.55902 0,1.45917 0.69505,1.94098 2.8,1.94098 1.54,0 3.32929,0.52929 3.97621,1.17621 1.77549,1.77549 -0.42194,3.8177 -4.14865,3.85559 -2.61793,0.0266 -2.88221,0.23031 -1.62189,1.25 0.82812,0.67001 1.9774,2.5682 2.55397,4.2182 0.86754,2.48271 0.70948,3.46787 -0.91666,5.71338 -1.17027,1.61602 -2.00095,4.44701 -2.05396,7 -0.0818,3.94056 0.12913,4.31179 2.61321,4.59843 1.6152,0.18638 2.94969,1.0915 3.31739,2.25 0.33834,1.06601 1.03483,1.93819 1.54777,1.93819 0.51293,0 0.93261,0.675 0.93261,1.5 0,0.84766 0.89545,1.5 2.05902,1.5 1.13246,0 1.81004,-0.40285 1.50574,-0.89522 z m 60.47615,-172.6239 c 0.33663,-1.66052 2.02074,-4.96376 3.74246,-7.34054 2.48577,-3.43149 3.00418,-4.95257 2.51743,-7.38636 -0.465,-2.32497 -0.30688,-2.87577 0.65491,-2.28136 3.14151,1.94157 4.08341,-5.22225 1.04782,-7.96942 -2.37026,-2.14506 -1.09681,-4.5032 2.43182,-4.5032 1.20476,0 3.43915,-1.30334 4.96532,-2.89632 2.46184,-2.56961 2.76616,-3.61304 2.69779,-9.25 -0.0424,-3.49452 -0.44979,-7.70368 -0.90534,-9.35368 -0.77145,-2.79414 -1.2182,-3.03513 -6.5107,-3.51192 -3.12533,-0.28155 -5.68242,-0.16905 -5.68242,0.25 0,0.41906 -1.8,0.76192 -4,0.76192 -3.29279,0 -4,0.34317 -4,1.94098 0,1.06754 0.45,2.2191 1,2.55902 0.55,0.33992 1,1.89333 1,3.45203 0,3.09509 -1.44552,4.04797 -6.1408,4.04797 -1.73018,0 -2.71836,0.41886 -2.3592,1 0.33992,0.55 2.39148,1 4.55902,1 3.27431,0 3.94098,0.33833 3.94098,2 0,1.1 0.42885,2 0.953,2 1.02287,0 3.30228,7.07805 2.52857,7.85176 -0.25532,0.25532 0.037,1.06813 0.64955,1.80623 0.88523,1.06664 0.52437,1.36902 -1.75868,1.47365 -2.71828,0.12458 -2.6846,0.17118 0.62756,0.86836 2.93113,0.61698 2.36227,0.77736 -3.5,0.98678 -3.85,0.13753 -7.3375,0.19677 -7.75,0.13164 -0.4125,-0.0651 -0.75,0.55658 -0.75,1.38158 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.9 -1,-2 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,0.45 -2,1 0,0.55 -0.9,1 -2,1 -1.25926,0 -2,-0.66667 -2,-1.8 0,-0.99 -0.54,-2.34 -1.2,-3 -0.93333,-0.93333 -0.93333,-1.46667 0,-2.4 1.88294,-1.88294 1.42211,-2.8 -1.40699,-2.8 -1.96639,0 -2.45784,0.38868 -2,1.58179 0.33385,0.86998 0.60699,3.11998 0.60699,5 0,2.75154 0.39007,3.41821 2,3.41821 1.48592,0 2,0.66667 2,2.59362 0,1.75262 0.64852,2.76321 2,3.11663 1.1,0.28766 2,1.31428 2,2.28138 0,1.13578 1.01553,1.96148 2.86813,2.332 2.34327,0.46865 2.81802,1.03005 2.59432,3.06786 -0.15058,1.37183 -0.53629,2.91896 -0.85711,3.43807 -0.32083,0.5191 0.0867,1.49991 0.90567,2.17958 1.88418,1.56372 1.94323,3.37915 0.0868,2.66675 -0.77123,-0.29595 -1.69345,-0.24687 -2.04938,0.10905 -0.87776,0.87776 6.34746,3.08886 9.41604,2.88155 1.88395,-0.12727 2.6086,-0.87763 3.07648,-3.18561 z M -36,744.46745 c 0,-4.6302 3.51156,-7.84447 7.80826,-7.14721 3.84024,0.62318 5.43946,-0.90856 4.5691,-4.37634 -0.60341,-2.4042 1.0748,-4.06284 2.22604,-2.20009 0.51536,0.83387 0.95057,0.61005 1.42657,-0.73369 0.83919,-2.36901 -0.86059,-6.43362 -2.69049,-6.43362 -0.7376,0 -1.33948,-1.05121 -1.33948,-2.33948 0,-1.56391 -0.91167,-2.77926 -2.75,-3.66604 -2.52619,-1.21859 -4.60936,-1.35163 -17,-1.0857 l -4.25,0.0912 0,6.97976 c 0,7.83997 2.16181,14.50129 5.24093,16.14918 1.59985,0.85622 1.83461,0.80031 1.17237,-0.27917 -0.556,-0.90633 -0.0207,-0.80643 1.62933,0.30407 1.85753,1.25014 2.39542,2.4096 2.20356,4.75 -0.13959,1.70289 0.19791,3.09616 0.75,3.09616 0.5521,0 1.00381,-1.39907 1.00381,-3.10905 z m -82.19125,-21.24831 c -0.67692,-1.26484 -0.64547,-2.20592 0.0986,-2.95 0.60095,-0.60095 1.09264,-0.71193 1.09264,-0.24662 0,0.46532 1.10351,-0.34468 2.45225,-1.8 1.34874,-1.45531 2.92374,-2.64602 3.5,-2.64602 0.57626,0 1.04775,-1.09844 1.04775,-2.44098 0,-1.34254 0.45,-2.7191 1,-3.05902 0.55,-0.33992 1,-2.33739 1,-4.43883 l 0,-3.82079 -6.25,-0.48061 c -7.80716,-0.60037 -11.23281,0.90426 -12.11631,5.32178 -1.08981,5.44907 -0.70412,8.53122 1.36631,10.91845 1.1,1.26831 2,3.28717 2,4.48634 0,2.75744 0.2821,3.01366 3.31805,3.01366 2.11124,0 2.33531,-0.27918 1.4907,-1.85736 z M -81,700.51894 c 0,-1.28247 -1.6719,-2.00558 -3.24309,-1.40265 -2.42177,0.92932 -1.66104,3.16454 0.90976,2.6731 C -82.05,701.54407 -81,700.97236 -81,700.51894 z m -23.77952,-140.97966 c 1.08135,-1.14125 1.30902,-1.95295 0.61287,-2.185 -0.72718,-0.24239 -1.04038,-3.70231 -0.91188,-10.07349 l 0.19574,-9.70429 -2.89194,0 c -4.14504,0 -4.45725,-0.8293 -1.68202,-4.46781 2.94435,-3.86025 3.14814,-6.53863 0.5492,-7.21826 -1.04915,-0.27436 -2.13202,-1.35723 -2.40638,-2.40638 -0.28331,-1.08341 -1.3725,-1.90755 -2.52102,-1.90755 -3.17924,0 -5.16505,-2.74144 -5.16505,-7.13045 0,-2.40374 -0.39719,-3.74211 -1,-3.36955 -0.55,0.33992 -1,2.39148 -1,4.55902 0,3.7122 -0.17415,3.94098 -3,3.94098 -2.22222,0 -3,0.46667 -3,1.8 0,0.99 -0.53608,2.33608 -1.19128,2.99128 -1.45124,1.45124 0.43508,9.80154 3.41107,15.10004 1.08753,1.93625 1.78616,4.81828 1.62406,6.69968 -0.15645,1.81595 0.009,3.59486 0.36695,3.95313 0.35827,0.35827 0.4225,1.2479 0.14274,1.97694 -0.27976,0.72905 0.43663,1.83145 1.59199,2.44978 1.58819,0.84997 1.87175,1.53324 1.16235,2.80087 -0.57721,1.03141 -0.58224,2.34193 -0.0131,3.40541 0.77928,1.4561 1.90948,1.63987 7.16521,1.16511 4.16834,-0.37653 6.81118,-1.16651 7.96047,-2.37946 z m 75.48406,-14.55099 c 1.86633,-1.42352 4.0238,-2.34628 4.79439,-2.05057 1.1078,0.4251 1.32537,-0.44606 1.03941,-4.16179 -0.19892,-2.58469 -0.40142,-7.07307 -0.45,-9.97418 -0.0803,-4.79763 -0.33692,-5.36926 -2.83651,-6.3196 -1.51149,-0.57467 -3.42399,-1.62978 -4.25,-2.34468 -0.82601,-0.71491 -2.72941,-1.51929 -4.22979,-1.78752 -2.05106,-0.36667 -2.87537,-0.0233 -3.322,1.38396 -0.32672,1.0294 -1.01163,1.61354 -1.52204,1.29809 -0.5104,-0.31544 -0.94418,0.0155 -0.96396,0.73548 -0.0198,0.71996 -1.03484,0.0895 -2.25568,-1.40099 -2.68479,-3.27782 -3.78964,-2.68153 -6.0097,3.24344 -2.24017,5.97862 -2.14571,10.12852 0.30134,13.23944 1.1,1.39842 2,3.1591 2,3.91262 0,1.358 1.87628,3.20962 5.57904,5.5057 3.32697,2.06307 8.45232,1.52227 12.1255,-1.2794 z m -48.0302,-16.91931 c 0.18187,-0.55413 -0.76882,-2.19327 -2.11265,-3.64252 -1.34382,-1.44925 -2.22937,-2.84895 -1.96789,-3.11043 0.26148,-0.26148 -0.61241,-0.26747 -1.94197,-0.0133 -1.32957,0.25416 -2.73388,-0.05 -3.1207,-0.67587 -0.94092,-1.52243 1.26367,-4.05036 3.5323,-4.05036 4.09969,0 2.39599,-1.51988 -1.88962,-1.68574 -5.30761,-0.20541 -6.13689,0.60648 -6.1585,6.02936 -0.012,3.00271 0.41979,3.9574 1.97344,4.36369 1.09382,0.28604 1.74226,0.91891 1.44099,1.40638 -1.17557,1.9021 0.95379,2.97519 5.33268,2.6874 2.51968,-0.1656 4.73005,-0.75447 4.91192,-1.30861 z M -82.5,506.5765 c -0.33992,-0.55 -0.11492,-1 0.5,-1 0.61532,0 0.78436,-0.5399 0.37593,-1.20075 -0.57659,-0.93294 -0.83183,-0.93155 -1.14442,0.006 -0.22128,0.66384 -0.8139,0.95262 -1.31692,0.64173 -1.04924,-0.64846 -1.2506,0.88344 -0.24792,1.88612 1.0469,1.0469 2.52075,0.77893 1.83333,-0.33333 z m -78.5,-33 c 0,-1.29205 -0.66667,-2 -1.88337,-2 -1.04236,0 -2.11691,0.89308 -2.40638,2 -0.41601,1.59081 -0.0307,2 1.88337,2 1.73971,0 2.40638,-0.55408 2.40638,-2 z m -24.16667,-15.15851 c 0.18334,-0.46282 2.06928,-0.84149 4.19099,-0.84149 4.66764,0 5.20399,-0.72001 4.3791,-5.87861 l -0.63962,-3.99996 -6.77904,0.18929 -6.77905,0.18928 -0.60285,4.38957 c -1.08296,7.8853 -0.9934,8.13656 2.64714,7.42692 1.7875,-0.34844 3.4,-1.01219 3.58333,-1.475 z M -160,455.5765 c 0,-2.2 0.45,-4 1,-4 0.55,0 1,-1.09844 1,-2.44098 0,-1.34254 0.45,-2.7191 1,-3.05902 1.86091,-1.15011 1.01425,-3.45832 -1.5,-4.08936 -1.375,-0.3451 -2.5,-1.02867 -2.5,-1.51905 0,-0.49037 -0.61232,-0.89159 -1.36071,-0.89159 -1.45811,0 -2.61496,6.70648 -2.6306,15.25 -0.008,4.40232 0.1743,4.75 2.49131,4.75 2.25,0 2.5,-0.4 2.5,-4 z m -7.43152,-17.5 C -168.72746,429.47878 -171,429.11607 -171,437.50695 c 0,5.35502 0.21832,5.9725 2.25,6.36382 1.2375,0.23835 2.26085,0.49465 2.27411,0.56955 0.0133,0.0749 -0.41678,-2.78882 -0.95563,-6.36382 z m -5.56848,3.5 c 0,-1.1 -0.45,-2 -1,-2 -0.55,0 -1,0.9 -1,2 0,1.1 0.45,2 1,2 0.55,0 1,-0.9 1,-2 z m 12,-24 c 0,-1.33333 -0.66667,-2 -2,-2 -1.33333,0 -2,0.66667 -2,2 0,1.33333 0.66667,2 2,2 1.33333,0 2,-0.66667 2,-2 z m 62,-45.25633 c 1.925,-1.1341 4.19376,-2.91268 5.04169,-3.9524 0.84793,-1.03972 3.25072,-2.10238 5.33953,-2.36146 2.08882,-0.25907 5.08521,-1.13677 6.65865,-1.95043 3.34729,-1.73095 4.31664,-1.86525 3.46013,-0.47938 -0.33992,0.55 -0.15005,1 0.42193,1 1.64951,0 2.39457,-4.69778 1.73932,-10.96686 -0.51626,-4.93936 -0.31883,-6.03305 1.36403,-7.55601 1.19892,-1.08502 1.63478,-2.20977 1.11562,-2.87892 -2.78154,-3.58519 -1.74585,-9.95404 1.80182,-11.08003 1.53716,-0.48787 2.05728,-1.50011 2.05728,-4.00378 0,-5.11296 -0.88645,-6.5144 -4.12056,-6.5144 -1.59862,0 -3.68797,-0.40158 -4.64301,-0.8924 -0.95504,-0.49082 -3.00171,-1.39383 -4.54816,-2.00668 -1.72977,-0.68551 -2.74366,-1.78512 -2.63484,-2.85761 0.0973,-0.95882 0.12506,-2.30581 0.0617,-2.99331 -0.14659,-1.59133 -6.80723,-1.67376 -7.33489,-0.0908 -0.42879,1.28645 -8.78024,-1.90154 -8.78024,-3.35165 0,-0.44415 -1.0699,-0.80755 -2.37756,-0.80755 -1.30765,0 -2.9219,-0.6559 -3.58721,-1.45756 -1.40558,-1.69361 -6.61,-1.06665 -9.11794,1.09842 -0.87049,0.75148 -3.39664,1.54104 -5.61367,1.75459 -6.91771,0.66631 -11.04228,4.02453 -11.68105,9.51067 -0.2081,1.78732 -0.88331,3.75462 -1.50047,4.37178 -1.95293,1.95294 -1.37115,8.54962 0.8779,9.95417 2.13867,1.33563 2.83962,7.13098 1,8.26793 -1.22203,0.75526 -1.33532,7.17472 -0.13967,7.91368 0.47319,0.29245 1.12607,2.47047 1.45086,4.84005 1.44165,10.51797 6.29726,15.96139 17.47577,19.59132 6.34126,2.05917 9.94346,1.59228 16.21304,-2.10138 z m 64.18623,-2.49367 c 0.6252,-1.5125 1.06667,-3.07968 0.98104,-3.48263 -0.0856,-0.40295 1.58839,-1.62239 3.72004,-2.70988 4.19945,-2.1424 5.68215,-5.34388 4.25794,-9.19387 -0.58864,-1.59124 -0.30148,-3.52984 0.93044,-6.28143 1.16745,-2.60756 1.4793,-4.54518 0.90442,-5.61936 -0.48259,-0.90171 -0.62494,-2.60502 -0.31633,-3.78511 0.83328,-3.18648 -0.30875,-6.50416 -2.76067,-8.01989 -1.6773,-1.03688 -2.3411,-1.06718 -2.91832,-0.13322 -0.54584,0.88318 -1.72464,0.54475 -4.37458,-1.25593 -3.21064,-2.18169 -4.03228,-2.33872 -7.1514,-1.36678 -3.23478,1.00798 -3.33666,1.15147 -1.24141,1.74842 1.65339,0.47106 1.04216,0.69972 -2.2174,0.82954 -12.26499,0.48849 -15.36507,0.96043 -16.89647,2.57222 -1.19946,1.26243 -1.28855,1.8045 -0.35353,2.15115 0.6875,0.25489 1.25,1.32594 1.25,2.3801 0,1.05417 0.49531,1.91667 1.10069,1.91667 1.10043,0 0.87393,4.82205 -0.5519,11.75 -0.42054,2.04339 -0.27532,3.25 0.39117,3.25 0.58302,0 1.06004,0.64468 1.06004,1.43261 0,0.78794 0.85843,1.70507 1.90762,2.03807 1.04919,0.333 2.16007,1.26332 2.46861,2.06739 0.30855,0.80406 1.43832,1.46193 2.5106,1.46193 3.63837,0 5.11317,1.16167 5.11317,4.02753 0,2.29835 0.5367,2.93144 2.9309,3.45729 1.612,0.35406 3.4671,1.28981 4.12245,2.07946 1.84762,2.22625 3.88502,1.70457 5.13288,-1.31428 z m -140.36981,-11.5 c 0.26501,-2.30314 0.79311,-2.75 3.25,-2.75 1.86577,0 2.93358,-0.51622 2.93358,-1.41821 0,-0.78002 0.30147,-2.20384 0.66994,-3.16405 0.49273,-1.28404 0.31961,-1.52931 -0.65451,-0.92728 -0.84808,0.52414 -1.08463,0.43053 -0.6577,-0.26027 0.36672,-0.59335 0.0987,-1.26814 -0.59549,-1.49953 -0.69423,-0.23138 -0.0247,-0.22969 1.48776,0.004 3.08581,0.4763 3.54488,-0.79671 1.15069,-3.19089 -1.20429,-1.2043 -1.32353,-1.9316 -0.48274,-2.94468 1.65029,-1.9887 0.21709,-4.59909 -2.52494,-4.59909 -1.31615,0 -2.39301,-0.45 -2.39301,-1 0,-1.52739 4.71289,-1.19057 5.31554,0.37989 0.4009,1.04475 1.53938,1.19523 4.68742,0.61957 5.88782,-1.07666 7.13454,-2.62577 4.01198,-4.98506 -2.86534,-2.16494 -2.29007,-3.26969 1.69339,-3.25201 1.53542,0.007 3.24167,-0.26755 3.79167,-0.60969 0.55,-0.34214 1.45,-0.62897 2,-0.63739 0.55,-0.008 1,-1.59031 1,-3.51531 0,-3.1527 -0.24807,-3.46799 -2.5,-3.17739 -1.375,0.17744 -2.99961,0.96494 -3.61024,1.75 -1.42674,1.8343 -4.38976,1.85132 -4.38976,0.0252 0,-0.7712 -1.35,-1.87279 -3,-2.44799 -2.05972,-0.71802 -3,-1.70956 -3,-3.16356 0,-3.23976 -1.85135,-5.98628 -4.03518,-5.98628 -1.08065,0 -1.96482,0.45 -1.96482,1 0,1.58352 -1.94792,1.17327 -5.10577,-1.07532 -2.11041,-1.50274 -2.86302,-2.81325 -2.72784,-4.75 0.10268,-1.47107 -0.57931,-4.13718 -1.51553,-5.92468 -1.31412,-2.50902 -2.35243,-3.25 -4.55409,-3.25 -1.56854,0 -3.41208,-0.675 -4.09677,-1.5 -2.17425,-2.61981 -3,-1.64276 -3,3.54966 0,2.77731 -0.72838,6.45819 -1.61862,8.17974 -1.58211,3.05945 -1.64442,3.08188 -2.76177,0.99408 -0.8222,-1.53628 -1.55482,-1.88155 -2.60942,-1.22978 -1.77908,1.09954 -2.78304,15.36335 -1.21563,17.27123 1.71745,2.09052 1.90198,11.28359 0.20544,10.23507 -1.09846,-0.67889 -1.16611,4.11978 -0.1265,8.97321 0.55529,2.5924 1.20639,3.07043 5.08359,3.73232 2.83495,0.48396 4.6819,0.3786 5.09554,-0.29069 0.9566,-1.5478 3.18536,4.50602 2.66555,7.24022 -0.37452,1.96995 -0.47004,1.8652 -0.59731,-0.65506 -0.0833,-1.65 -0.58771,-3.675 -1.12087,-4.5 -0.68861,-1.06555 -0.97381,0.15101 -0.98469,4.20031 -0.0189,7.04666 1.0764,7.87402 9.98469,7.54197 6.27856,-0.23403 6.51078,-0.33597 6.81642,-2.99228 z m -0.20943,-14.33179 c -0.93873,-2.44628 -0.7352,-2.7695 0.89301,-1.41821 1.66238,1.37965 1.99022,3 0.60699,3 -0.49116,0 -1.16616,-0.7118 -1.5,-1.58179 z M -65,344.5765 c 0,-1.1 -0.45,-2 -1,-2 -0.55,0 -1,0.9 -1,2 0,1.1 0.45,2 1,2 0.55,0 1,-0.9 1,-2 z m -82,-15 c 0,-1.1 -0.45,-2 -1,-2 -0.55,0 -1,0.9 -1,2 0,1.1 0.45,2 1,2 0.55,0 1,-0.9 1,-2 z m -1.61621,-15.44224 c -0.61625,-1.60592 -0.76876,-1.62123 -1.5869,-0.1593 -1.08038,1.93053 -0.004,4.20898 1.34876,2.85589 0.50595,-0.50595 0.61312,-1.71942 0.23814,-2.69659 z M -177,271.45987 c 0,-3.82851 0.15748,-4.06323 2.25,-3.35364 1.2375,0.41965 4.36352,0.84713 6.94672,0.94997 5.19812,0.20693 7.46864,1.56327 8.10706,4.84292 0.35517,1.8245 0.44593,1.74262 0.56004,-0.50523 0.15371,-3.02785 1.94539,-3.91251 8.09578,-3.9974 5.3758,-0.0742 6.9066,-1.9966 3.99946,-5.02259 -1.21394,-1.26357 -3.06148,-4.18521 -4.10564,-6.49254 -2.61703,-5.78295 -6.10563,-8.30486 -11.48828,-8.30486 -2.40083,0 -4.39614,0.3375 -4.43404,0.75 -0.0379,0.4125 -0.31132,2.1 -0.60761,3.75 -0.2963,1.65 -0.50956,4.22285 -0.47392,5.71744 0.0356,1.49459 -0.43546,3.02662 -1.04689,3.40451 -0.6735,0.41624 -0.83044,0.23199 -0.39817,-0.46744 1.23585,-1.99966 -0.89351,-1.25091 -2.40451,0.84549 -0.85181,1.18183 -2.58869,2 -4.24576,2 -2.31582,0 -2.90874,0.52251 -3.40424,3 -0.33,1.65 -0.99375,3 -1.475,3 -0.48125,0 -0.875,0.9 -0.875,2 0,1.46667 0.66667,2 2.5,2 2.26181,0 2.5,-0.39222 2.5,-4.11663 z"
+         id="path3133"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#706f6c"
+         d="m -212.10374,951.3265 c 0.0376,-8.3875 -0.12891,-23.125 -0.37005,-32.75 -0.24114,-9.625 -0.39572,-20.65 -0.34351,-24.5 0.0522,-3.85 0.0849,-11.05 0.0726,-16 -0.0432,-17.43694 -0.0111,-52.07034 0.0537,-58 0.0782,-7.15534 -1.02201,-59.07021 -1.83319,-86.5 -1.68929,-57.12226 -1.87961,-104.10527 -0.44201,-109.11789 0.52318,-1.8242 0.47064,-4.05531 -0.13286,-5.64265 -0.54901,-1.44399 -1.03554,-11.20109 -1.08117,-21.68245 -0.0456,-10.48135 -0.16079,-47.18201 -0.25589,-81.55701 -0.13148,-47.52343 -0.48589,-63.78905 -1.47903,-67.87946 -0.9382,-3.86411 -1.0931,-8.37115 -0.54991,-16 0.41591,-5.8413 0.60173,-19.62054 0.41294,-30.62054 -0.31472,-18.33723 -0.40775,-37.16427 -0.23965,-48.5 0.0367,-2.475 0.0175,-10.35 -0.0427,-17.5 -0.0602,-7.15 0.088,-17.05 0.3293,-22 0.24128,-4.95 -0.1808,-13.32808 -0.93796,-18.61796 -1.10633,-7.72929 -1.1511,-11.85305 -0.22801,-21 0.80747,-8.00123 0.85128,-13.98533 0.14748,-20.14645 -0.55065,-4.82042 -0.91627,-11.79542 -0.8125,-15.5 0.10378,-3.70457 -0.34129,-9.79055 -0.98903,-13.52439 -0.99469,-5.7338 -0.92371,-7.79997 0.45673,-13.29553 1.46028,-5.8134 1.50724,-8.98193 0.44071,-29.73641 -0.88406,-17.20367 -0.9033,-23.99356 -0.0742,-26.17434 0.61576,-1.61957 1.02938,-7.23322 0.91915,-12.47479 -0.11022,-5.24157 -0.14197,-11.78013 -0.0706,-14.53013 0.0714,-2.75 -0.49329,-6.575 -1.25489,-8.5 -0.76161,-1.925 -1.90413,-9.27924 -2.53895,-16.34276 -1.09536,-12.187974 -1.0438,-13.174514 1.01114,-19.349614 1.55413,-4.67016 1.96301,-7.53724 1.44854,-10.15724 -1.86231,-9.48398 -2.2414,-14.87022 -1.2864,-18.27723 0.69019,-2.4623 0.68699,-6.454805 -0.01,-12.434251 -0.62756,-5.384042 -0.67373,-9.735482 -0.11879,-11.195083 0.56247,-1.479411 0.50702,-4.547582 -0.14578,-8.065748 -0.57946,-3.122943 -1.53491,-12.203078 -2.12321,-20.178078 -0.92194,-12.497592 -0.83742,-15.707905 0.61197,-23.246784 0.9249,-4.810731 1.42563,-9.161001 1.11274,-9.667267 -0.64886,-1.049876 -3.50677,-16.683582 -3.53469,-19.335949 -0.0156,-1.481966 0.93884,-1.75 6.23157,-1.749999 l 6.25,10e-7 0.23717,9.749999 c 0.13045,5.362499 0.74979,12.899999 1.37632,16.749999 1.7283,10.62037 1.63292,29.710334 -0.1943,38.887008 -1.42787,7.171083 -1.4321,8.479665 -0.0438,13.526075 1.00558,3.655132 1.56357,10.254805 1.61375,19.086917 0.0422,7.425 0.45645,15.22477 0.92059,17.33282 0.70016,3.18003 0.48166,4.32277 -1.28294,6.70951 -2.67269,3.61501 -2.66253,3.78908 0.40837,6.99441 1.67385,1.74712 2.81939,4.44396 3.37165,7.93753 0.90316,5.71331 0.54141,8.3197 -1.62046,11.67537 -2.07515,3.221074 -2.01062,15.100454 0.10409,19.161594 1.44352,2.77218 1.53455,3.88592 0.55918,6.84131 -0.74522,2.25806 -0.92014,6.10963 -0.48542,10.68877 0.71961,7.58005 0.99575,14.21509 0.79736,19.15869 -0.65834,16.40464 -0.28508,31.67536 0.95328,39 0.72095,4.26424 1.05817,14.42563 0.86287,26 -0.71419,42.32396 -0.57636,48.83318 1.28506,60.68694 1.6038,10.21324 1.68491,12.98741 0.64327,22 -2.97236,25.71773 -3.02262,26.99994 -1.35861,34.65899 1.34166,6.17536 1.40704,8.51718 0.41026,14.69616 -0.95684,5.93143 -0.93208,7.79494 0.12828,9.65407 0.89338,1.56637 1.38287,7.10543 1.52916,17.30384 0.11835,8.25 0.4877,27.72548 0.82079,43.27884 0.52203,24.37566 0.38449,28.94461 -0.99652,33.10243 -1.19464,3.59671 -1.34421,5.502 -0.58808,7.49078 2.93714,7.72529 4.04864,16.45065 4.04864,31.78227 0,14.45656 0.19418,16.27708 1.97799,18.54482 1.6162,2.05468 1.76946,2.90424 0.83791,4.64485 -1.80104,3.36528 -2.064,56.27898 -0.29895,60.15601 0.75118,1.65 1.85951,4.9125 2.46296,7.25 0.60345,2.3375 1.58493,4.25 2.18108,4.25 0.697,0 0.63014,0.54675 -0.18733,1.53173 -0.99381,1.19747 -1.02053,2.36848 -0.12244,5.36602 1.73765,5.79977 1.42008,7.51078 -1.7406,9.37783 -3.44832,2.03698 -4.54616,5.54293 -2.94505,9.40502 0.76145,1.83672 1.1977,10.50266 1.25164,24.86336 0.0712,18.96815 0.31992,22.40586 1.78225,24.63768 1.60655,2.45193 1.59932,2.79017 -0.13236,6.18676 -2.39134,4.69047 -3.54494,13.87024 -2.08568,16.59688 0.73414,1.37175 1.13067,11.46555 1.16814,29.7354 0.044,21.45891 0.39126,28.79523 1.54916,32.72901 2.42803,8.24881 2.64024,13.08447 0.82717,18.8487 -1.46572,4.65989 -1.53294,6.79433 -0.5439,17.26934 0.62069,6.57375 1.45438,18.70227 1.85264,26.95227 0.41345,8.56451 1.24781,15.93712 1.94474,17.18426 1.73378,3.10252 1.51612,5.67036 -0.72179,8.51541 -2.96172,3.76521 -3.94545,24.74384 -1.59646,34.04549 1.76695,6.99688 1.71926,12.56002 -0.24222,28.25484 -0.54989,4.4 -0.85217,21.1625 -0.67172,37.25 l 0.32808,29.25 -9.52369,0 -9.52369,0 0.0684,-15.25 z M -108,965.0765 c 0,-0.825 0.70156,-1.5 1.55902,-1.5 0.85746,0 1.30465,0.4116 0.99377,0.9146 -0.31089,0.503 5e-5,1.1425 0.69098,1.421 0.69093,0.2786 0.24373,0.542 -0.99377,0.5855 -1.36842,0.048 -2.25,-0.5088 -2.25,-1.4211 z m 6,0.5 c 1.23508,-0.7982 1.2498,-0.9721 0.0833,-0.9847 -2.95068,-0.032 -0.15242,-1.1135 4.28752,-1.6573 3.81763,-0.4675 4.62915,-0.2856 4.62915,1.0376 0,1.116 0.9132,1.6044 3,1.6044 2.10256,0 3,-0.4861 3,-1.625 0,-1.2818 0.65086,-1.4948 3.08186,-1.0086 3.0777,0.6155 6.15412,-0.4595 8.75345,-3.0589 1.05352,-1.0535 1.70353,-1.1052 2.76973,-0.2203 1.05993,0.8796 2.15603,0.8402 4.58263,-0.1649 1.75421,-0.7267 3.89212,-1.4245 4.7509,-1.5508 0.85879,-0.1264 3.13643,-0.6352 5.06143,-1.1308 1.925,-0.4956 4.74448,-0.5646 6.26552,-0.1532 1.52103,0.4113 6.94565,0.7814 12.0547,0.8223 l 9.28918,0.074 3.77651,-3.8675 c 3.77013,-3.8609 9.89354,-16.23931 11.51855,-23.28455 0.47902,-2.07677 0.43787,-7.06518 -0.0949,-11.5 -0.51747,-4.30774 -0.89006,-11.65725 -0.828,-16.33225 0.0935,-7.04364 -0.28076,-9.26756 -2.18439,-12.97985 -1.93217,-3.76795 -3.09178,-4.76051 -7.29722,-6.24597 -2.75,-0.97136 -6.3725,-1.76793 -8.05,-1.77015 -1.6775,-0.002 -3.4775,-0.42498 -4,-0.93948 -1.49716,-1.47423 -18.47415,-2.64524 -29.45471,-2.03169 -3.0276,0.16918 -7.9776,-0.40649 -11,-1.27925 -3.02241,-0.87276 -8.19529,-2.11728 -11.49529,-2.76559 -8.21064,-1.61304 -10.80639,-2.74721 -10.15751,-4.43815 0.75641,-1.97118 -1.65722,-3.83514 -3.09907,-2.39329 -1.81623,1.81623 -3.87925,0.28319 -6.77252,-5.03272 -2.06302,-3.79043 -3.37033,-5.09028 -5.35048,-5.31994 -1.98311,-0.23 -2.9107,-1.15515 -3.81398,-3.80392 -0.65645,-1.925 -1.21895,-3.23218 -1.25,-2.90484 -0.031,0.32734 -1.85644,-1.11713 -4.05644,-3.20994 -4.38605,-4.17235 -5.19376,-7.90865 -2.38148,-11.01618 1.66867,-1.84386 1.19098,-7.48737 -0.54305,-6.41568 -0.47625,0.29433 -1.14826,-0.20067 -1.49337,-1.10001 -0.67627,-1.76233 2.02319,-6.71533 3.24755,-5.95863 0.40798,0.25214 0.81432,-0.29602 0.90299,-1.21814 0.33753,-3.51046 1.10345,-7.10234 1.73096,-8.11769 0.35875,-0.58046 -0.0205,-2.01593 -0.84283,-3.18992 -1.06943,-1.52683 -1.32944,-3.5332 -0.91326,-7.04718 0.37629,-3.17716 0.11971,-5.77612 -0.7263,-7.3569 -1.0733,-2.00549 -1.07581,-3.14823 -0.014,-6.36568 0.7118,-2.15678 1.00962,-5.05519 0.66183,-6.44091 -0.80164,-3.19398 0.5347,-6.73118 3.76243,-9.95891 1.38993,-1.38993 2.81923,-3.6909 3.17622,-5.11327 0.75908,-3.02441 -0.74985,-2.83254 21.43226,-2.72536 12.27515,0.0593 18.39371,-0.30177 20.49336,-1.20938 2.18268,-0.94351 3.73104,-1.01549 5.71719,-0.2658 1.92316,0.72591 4.44138,0.67337 8.56684,-0.17873 7.97316,-1.64683 13.72703,-1.51449 17.43102,0.40092 4.5541,2.35502 16.79159,0.4485 16.79159,-2.61602 0,-0.51583 2.0709,-4.29358 4.60201,-8.39501 4.09495,-6.63548 4.65804,-8.26364 5.11053,-14.77693 1.32513,-19.07416 -0.62632,-32.67971 -5.48017,-38.20793 -1.5028,-1.7116 -3.18237,-3.27839 -3.73237,-3.48174 -4.45826,-1.64839 -5.34353,-2.16078 -5.72834,-3.31552 -0.28322,-0.8499 -3.23665,-1.57107 -8.35487,-2.04009 -16.54185,-1.51585 -25.00973,-2.50693 -27.67978,-3.23965 -1.72723,-0.47398 -3.29542,-0.31633 -4.18333,0.42057 -1.60011,1.32797 -15.209,0.41127 -16.13489,-1.08685 -0.29525,-0.47773 -3.32277,-0.88079 -6.72781,-0.8957 -3.40504,-0.0149 -10.39626,-0.43386 -15.53604,-0.93103 C -120.5686,684.67782 -124,683.07679 -124,679.48053 c 0,-0.9823 -0.45,-2.06411 -1,-2.40403 -0.55,-0.33992 -1,-1.39246 -1,-2.33897 0,-0.94652 -1.53226,-3.1662 -3.40501,-4.93263 -4.24782,-4.00666 -5.81407,-11.7189 -3.1925,-15.71992 1.00322,-1.53111 1.59751,-4.6133 1.59751,-8.28524 0,-5.31947 0.26707,-6.04458 2.95951,-8.03518 1.62773,-1.20343 3.66685,-2.18806 4.53138,-2.18806 1.91037,0 3.35136,-3.21925 1.68902,-3.77336 -0.69286,-0.23096 -1.17991,-2.41933 -1.17991,-5.3015 0,-3.82519 0.44131,-5.18379 2,-6.15721 2.60851,-1.62905 2.53029,-3.48198 -0.25,-5.92189 -1.55878,-1.36795 -1.86599,-2.13401 -1,-2.49363 2.39839,-0.99596 1.24103,-4.0423 -2.25,-5.92234 -4.11429,-2.21569 -5.00564,-6.80307 -1.5,-7.71982 1.5137,-0.39584 2,-1.36401 2,-3.98177 0,-1.94457 0.87557,-4.57187 2,-6.00135 1.1,-1.39842 2.03289,-3.37161 2.07309,-4.38486 0.0402,-1.01325 0.86329,-3.19042 1.82909,-4.83816 2.17885,-3.7173 5.31094,-4.36793 21.40519,-4.44648 12.00021,-0.0586 25.41857,-1.63989 27.14263,-3.19869 1.48939,-1.34662 4.88946,-1.0099 7.37387,0.73025 1.24789,0.87406 2.94081,1.33135 3.76204,1.01622 0.82124,-0.31514 2.285,-0.0785 3.2528,0.52594 1.24992,0.78058 4.72563,0.81601 11.99857,0.1223 8.62275,-0.82246 10.64414,-1.35364 12.80606,-3.36513 C -27.36682,567.6832 -22,556.89319 -22,553.66392 c 0,-1.2204 0.53438,-3.20182 1.18751,-4.40316 0.77373,-1.42317 1.113,-6.53979 0.97367,-14.68426 -0.21755,-12.71725 -2.04797,-21.90487 -5.97172,-29.97458 -1.98211,-4.07645 -8.26835,-7.98519 -12.88044,-8.00897 -1.75504,-0.009 -3.4691,-0.46645 -3.80902,-1.01645 -0.88203,-1.42715 -5.70202,-1.23593 -8.02749,0.31846 -1.37093,0.91636 -5.17481,1.26189 -12.47251,1.13296 -15.17146,-0.26803 -14.85205,-0.21256 -17.71591,-3.07642 -1.44375,-1.44375 -3.69204,-2.625 -4.99621,-2.625 -2.7182,0 -4.39961,1.30533 -2.53788,1.97024 2.36677,0.84527 1.24558,2.4121 -1.5,2.09618 -1.54669,-0.17796 -2.64061,-0.86338 -2.5,-1.56642 0.1375,-0.6875 -0.66005,-1.25 -1.77234,-1.25 -2.97897,0 -10.97766,-7.74345 -10.97766,-10.62736 0,-1.92736 -0.52126,-2.37264 -2.77749,-2.37264 -4.82229,0 -7.22251,-2.51128 -7.22251,-7.5567 0,-2.44382 0.45,-4.4433 1,-4.4433 0.55,0 1,-0.9 1,-2 0,-1.33333 -0.66667,-2 -2,-2 -1.72222,0 -2,-0.66667 -2,-4.8 0,-2.64 -0.46123,-5.26123 -1.02495,-5.82495 -0.56372,-0.56372 -1.2443,-4.3997 -1.51239,-8.52439 -0.46624,-7.17333 -0.3805,-7.55667 1.97191,-8.81564 3.48541,-1.86534 3.87722,-3.78462 1.13888,-5.57885 -1.51817,-0.99474 -2.19056,-2.20433 -1.88176,-3.38518 0.26426,-1.01055 -0.18138,-3.12743 -0.99031,-4.70418 -1.25671,-2.44954 -1.46588,-4.63858 -0.829,-8.67583 0.0702,-0.44496 0.54522,-0.55092 1.05562,-0.23548 1.51281,0.93497 1.97018,-2.52802 1.24883,-9.4555 -0.59722,-5.7355 -0.94146,-6.53758 -2.92683,-6.81955 -1.2375,-0.17575 -2.25,-0.73825 -2.25,-1.25 0,-1.27883 2.35901,-1.17144 3.69884,0.16839 0.79845,0.79845 1.28689,0.24261 1.78676,-2.03328 0.37836,-1.72266 1.88638,-4.42082 3.35116,-5.9959 2.3917,-2.5718 3.22402,-2.83614 8.16324,-2.59263 3.025,0.14914 8.02967,0.79772 11.1215,1.44128 5.25951,1.09478 6.00003,0.9998 11.5,-1.47511 5.68246,-2.55702 6.49546,-2.64439 24.3785,-2.6199 10.175,0.0139 19.69848,-0.19279 21.16329,-0.45939 3.31793,-0.60388 9.83671,-8.6978 9.83671,-12.21357 0,-1.38679 0.8998,-3.47924 1.99957,-4.64988 2.35043,-2.50192 3.79552,-9.60523 4.42793,-21.76539 0.50785,-9.76522 -1.28284,-18.0521 -4.2432,-19.63644 -0.96164,-0.51465 -2.7619,-2.96501 -4.00059,-5.44524 -1.69085,-3.38559 -2.98848,-4.67124 -5.20647,-5.15839 -1.62487,-0.35688 -3.18448,-1.0213 -3.4658,-1.4765 -0.28133,-0.45519 -2.87399,-2.14947 -5.76147,-3.76506 -8.9819,-5.02552 -23.95568,-7.81932 -47.81946,-8.92211 -16.99074,-0.78517 -17.60989,-1.01049 -18.46608,-6.71994 -0.37036,-2.46979 -1.52638,-5.26246 -2.56891,-6.20594 -1.04254,-0.94349 -1.89552,-2.7182 -1.89552,-3.94381 0,-2.69917 -3.39284,-3.89815 -5.12496,-1.81107 -1.75621,2.1161 -2.84099,-0.10064 -2.85973,-5.84387 -0.0122,-3.72667 0.44243,-5.01391 2.2072,-6.25 1.22237,-0.85618 2.95014,-1.5567 3.83948,-1.5567 2.05763,0 3.93801,-4.08584 3.93801,-8.55684 0,-2.22525 0.71474,-4.07472 2,-5.17519 4.31612,-3.69558 1.54185,-6.75717 -7.25,-8.00084 -3.10259,-0.43889 -3.75,-0.93076 -3.75,-2.84911 0,-1.27525 0.6935,-2.70674 1.54112,-3.18109 0.84762,-0.47435 2.17056,-3.24854 2.93987,-6.16485 l 1.39874,-5.3024 -3.0002,-2.5245 c -2.11395,-1.77877 -2.68698,-2.83773 -1.93987,-3.58484 1.20114,-1.20114 1.45966,-12.92769 0.31034,-14.07701 -1.03465,-1.03465 -0.99778,-2.95631 0.0711,-3.70699 0.48843,-0.34301 2.14557,-0.149 3.68253,0.43114 2.21969,0.83784 3.32222,0.70901 5.36023,-0.62634 1.41116,-0.92463 3.72751,-1.68114 5.14744,-1.68114 1.78857,0 3.08377,-0.87482 4.21602,-2.84765 2.80222,-4.8826 8.57279,-7.17191 17.77265,-7.05083 4.4,0.0579 15.875,-0.17784 25.5,-0.5239 l 17.5,-0.62921 4.75722,-3.2242 c 3.54524,-2.40279 5.18158,-4.37066 6.42289,-7.72421 0.91611,-2.475 2.82536,-6.525 4.24277,-9 2.40656,-4.20218 2.57712,-5.36036 2.57712,-17.5 0,-9.57356 -0.51403,-15.04269 -1.95025,-20.75 -1.07264,-4.2625 -2.26135,-7.75 -2.64159,-7.75 -0.38024,0 -0.99505,-1.21005 -1.36624,-2.68901 -0.96173,-3.83181 -4.3841,-8.30928 -6.36001,-8.32076 -0.92505,-0.005 -4.07586,-1.12424 -7.0018,-2.48637 -3.78095,-1.76018 -8.33731,-2.76251 -15.75074,-3.46494 -5.73697,-0.54358 -11.70509,-1.64726 -13.26249,-2.45262 -1.5574,-0.80537 -6.84457,-1.99687 -11.74926,-2.64779 -4.90469,-0.65092 -11.21866,-2.23748 -14.03105,-3.525694 -5.64966,-2.58782 -6.35229,-4.24117 -6.37556,-15.0023 -0.01,-4.45314 -0.32359,-5.23191 -2.51101,-6.22857 -2.31988,-1.057 -2.5,-1.64311 -2.5,-8.13483 0,-6.76165 0.10039,-7.04767 3,-8.54712 1.65,-0.85325 3,-1.9898 3,-2.52568 0,-1.06446 14.26228,-1.37871 15.30379,-0.3372 0.35042,0.35042 -0.24958,1.88239 -1.33334,3.40437 -1.08375,1.52199 -1.97045,3.49642 -1.97045,4.38763 0,3.30569 9.76002,4.82812 13.61994,2.12453 1.91567,-1.34179 2.0315,-2.19116 1.60235,-11.75 -0.25443,-5.66701 -0.83325,-10.445223 -1.28627,-10.618258 -2.1417,-0.818053 0.58652,-3.185392 3.671,-3.185392 2.34934,0 3.39301,-0.46139 3.39301,-1.5 0,-0.933333 -0.94444,-1.5 -2.5,-1.5 -2.4578,0 -2.5,-0.134688 -2.5,-7.979676 l 0,-7.979676 -4.03532,-2.058667 c -2.21943,-1.132266 -3.76787,-2.491412 -3.44098,-3.020324 0.32688,-0.528911 0.2142,-0.961657 -0.2504,-0.961657 -1.0993,0 -1.25629,-2.948328 -0.6001,-11.27022 0.41459,-5.257835 0.95438,-6.995282 2.41638,-7.777719 1.4769,-0.790414 2.2626,-0.546543 3.64647,1.131811 0.97017,1.176621 2.43493,2.840434 3.25502,3.697362 1.12218,1.172588 1.18403,1.660399 0.25,1.971742 -1.95761,0.652538 -1.48927,3.44467 0.50893,3.034096 1.01054,-0.207638 1.62515,-1.086719 1.45453,-2.080433 -0.26926,-1.568232 3.86017,-8.117643 6.28978,-9.975779 1.2347,-0.944281 20.16471,-0.374279 23.20241,0.698648 1.89365,0.668843 2.66706,0.03739 5.60573,-4.576808 9.08183,-14.260011 10.47096,-17.855324 11.18965,-28.960708 0.36989,-5.715595 0.89081,-11.179492 1.1576,-12.141992 0.4613,-1.664214 30.2619,-1.75 607.91769,-1.75 l 607.43261,0 0,508.500004 0,508.5 -647.25,-0.015 c -418.23825,-0.0102 -646.71927,-0.3586 -645.75,-0.985 z m -14,-748 c 0,-1.1 -0.45,-2 -1,-2 -0.55,0 -1,0.9 -1,2 0,1.1 0.45,2 1,2 0.55,0 1,-0.9 1,-2 z M -83.75,59.128546 c -1.2375,-0.56447 -2.25,-1.83405 -2.25,-2.8213 0,-3.1789 2.7668,-8.535575 5.03602,-9.750027 1.48563,-0.795085 1.98352,-0.821353 1.52564,-0.08049 -0.37383,0.604871 -0.20314,1.099767 0.37932,1.099767 0.62536,0 1.05902,2.40921 1.05902,5.88337 0,6.43495 -1.28746,7.7042 -5.75,5.66868 z"
+         id="path3131"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#816858"
+         d="m -108,965.0765 c 0,-0.825 0.70156,-1.5 1.55902,-1.5 0.85746,0 1.30465,0.4116 0.99377,0.9146 -0.31089,0.503 5e-5,1.1425 0.69098,1.421 0.69093,0.2786 0.24373,0.542 -0.99377,0.5855 -1.36842,0.048 -2.25,-0.5088 -2.25,-1.4211 z m 6,0.5 c 1.23508,-0.7982 1.2498,-0.9721 0.0833,-0.9847 -2.95068,-0.032 -0.15242,-1.1135 4.28752,-1.6573 3.81763,-0.4675 4.62915,-0.2856 4.62915,1.0376 0,1.116 0.9132,1.6044 3,1.6044 2.10256,0 3,-0.4861 3,-1.625 0,-1.2818 0.65086,-1.4948 3.08186,-1.0086 3.0777,0.6155 6.15412,-0.4595 8.75345,-3.0589 1.05352,-1.0535 1.70353,-1.1052 2.76973,-0.2203 1.05993,0.8796 2.15603,0.8402 4.58263,-0.1649 1.75421,-0.7267 3.89212,-1.4245 4.7509,-1.5508 0.85879,-0.1264 3.13643,-0.6352 5.06143,-1.1308 1.925,-0.4956 4.74446,-0.5646 6.26546,-0.1533 1.52101,0.4114 7.39513,0.7851 13.05361,0.8305 l 10.28814,0.083 3.08859,-3.2503 c 1.69873,-1.7876 4.09587,-5.2752 5.32699,-7.7502 1.23111,-2.475 3.19012,-5.84965 4.35335,-7.49923 1.95453,-2.7717 2.10046,-4.16212 1.92359,-18.32839 -0.1954,-15.65096 -1.25211,-23.57007 -4.09286,-30.67238 -0.87994,-2.2 -1.67941,-4.13044 -1.77659,-4.28987 -0.57636,-0.94599 -11.40575,-4.21053 -13.96613,-4.21053 -1.68527,0 -3.49162,-0.42095 -4.01412,-0.93545 -1.49716,-1.47423 -18.47415,-2.64524 -29.45471,-2.03169 -3.0276,0.16918 -7.9776,-0.40649 -11,-1.27925 -3.02241,-0.87276 -8.19529,-2.11728 -11.49529,-2.76559 -8.21064,-1.61304 -10.80639,-2.74721 -10.15751,-4.43815 0.75641,-1.97118 -1.65722,-3.83514 -3.09907,-2.39329 -1.81623,1.81623 -3.87925,0.28319 -6.77252,-5.03272 -2.06302,-3.79043 -3.37033,-5.09028 -5.35048,-5.31994 -1.98311,-0.23 -2.9107,-1.15515 -3.81398,-3.80392 -0.65645,-1.925 -1.21895,-3.23218 -1.25,-2.90484 -0.031,0.32734 -1.85644,-1.11713 -4.05644,-3.20994 -4.38605,-4.17235 -5.19376,-7.90865 -2.38148,-11.01618 1.66867,-1.84386 1.19098,-7.48737 -0.54305,-6.41568 -0.47625,0.29433 -1.14826,-0.20067 -1.49337,-1.10001 -0.67627,-1.76233 2.02319,-6.71533 3.24755,-5.95863 0.40798,0.25214 0.81432,-0.29602 0.90299,-1.21814 0.33753,-3.51046 1.10345,-7.10234 1.73096,-8.11769 0.35875,-0.58046 -0.0205,-2.01593 -0.84283,-3.18992 -1.06943,-1.52683 -1.32944,-3.5332 -0.91326,-7.04718 0.37629,-3.17716 0.11971,-5.77612 -0.7263,-7.3569 -1.0733,-2.00549 -1.07581,-3.14823 -0.014,-6.36568 0.7118,-2.15678 1.00962,-5.05519 0.66183,-6.44091 -0.80164,-3.19398 0.5347,-6.73118 3.76243,-9.95891 1.38993,-1.38993 2.81923,-3.6909 3.17622,-5.11327 0.75908,-3.02441 -0.74985,-2.83254 21.43226,-2.72536 12.27515,0.0593 18.39371,-0.30177 20.49336,-1.20938 2.18268,-0.94351 3.73104,-1.01549 5.71719,-0.2658 1.92316,0.72591 4.44138,0.67337 8.56684,-0.17873 7.82565,-1.61636 13.71411,-1.52117 17.19321,0.27795 2.41656,1.24965 10.12055,1.54564 16.25908,0.62467 0.40132,-0.0602 1.59093,-1.79697 2.64359,-3.85947 1.05265,-2.0625 2.86369,-4.60896 4.02454,-5.6588 3.72959,-3.37296 4.80849,-9.55503 5.11486,-29.30791 0.14551,-9.38158 -1.3927,-19.7821 -3.07995,-20.82487 C -19.58028,704.71787 -20,702.9312 -20,701.06454 c 0,-4.09562 -1.9331,-8.69292 -3.42231,-8.13894 -0.59273,0.2205 -0.94144,0.97841 -0.7749,1.68426 0.77833,3.29898 -5.74695,2.29519 -7.91594,-1.21771 -0.48632,-0.78765 -3.93753,-1.6068 -8.59959,-2.04112 -16.95627,-1.57967 -24.90901,-2.51484 -27.55025,-3.23965 -1.72723,-0.47398 -3.29542,-0.31633 -4.18333,0.42057 -1.60011,1.32797 -15.209,0.41127 -16.13489,-1.08685 -0.29525,-0.47773 -3.32277,-0.88079 -6.72781,-0.8957 -3.40504,-0.0149 -10.39626,-0.43386 -15.53604,-0.93103 C -120.5686,684.67782 -124,683.07679 -124,679.48053 c 0,-0.9823 -0.45,-2.06411 -1,-2.40403 -0.55,-0.33992 -1,-1.39246 -1,-2.33897 0,-0.94652 -1.53226,-3.1662 -3.40501,-4.93263 -4.24782,-4.00666 -5.81407,-11.7189 -3.1925,-15.71992 1.00322,-1.53111 1.59751,-4.6133 1.59751,-8.28524 0,-5.31947 0.26707,-6.04458 2.95951,-8.03518 1.62773,-1.20343 3.66685,-2.18806 4.53138,-2.18806 1.91037,0 3.35136,-3.21925 1.68902,-3.77336 -0.69286,-0.23096 -1.17991,-2.41933 -1.17991,-5.3015 0,-3.82519 0.44131,-5.18379 2,-6.15721 2.60851,-1.62905 2.53029,-3.48198 -0.25,-5.92189 -1.55878,-1.36795 -1.86599,-2.13401 -1,-2.49363 2.39839,-0.99596 1.24103,-4.0423 -2.25,-5.92234 -4.11429,-2.21569 -5.00564,-6.80307 -1.5,-7.71982 1.5137,-0.39584 2,-1.36401 2,-3.98177 0,-1.94457 0.87557,-4.57187 2,-6.00135 1.1,-1.39842 2.03289,-3.37161 2.07309,-4.38486 0.0402,-1.01325 0.86329,-3.19042 1.82909,-4.83816 2.17885,-3.7173 5.31094,-4.36793 21.40519,-4.44648 12.00021,-0.0586 25.41857,-1.63989 27.14263,-3.19869 1.48939,-1.34662 4.88946,-1.0099 7.37387,0.73025 1.24789,0.87406 2.98006,1.31629 3.84926,0.98275 0.8692,-0.33355 2.13168,-0.1489 2.80551,0.41033 0.78089,0.64809 5.64424,0.77916 13.41221,0.36148 l 12.18707,-0.65529 3.95595,-4.96847 c 2.17577,-2.73265 4.42047,-6.69355 4.98821,-8.802 0.56775,-2.10845 1.44813,-4.09056 1.95639,-4.40469 0.53684,-0.33178 0.75914,-8.83593 0.53044,-20.29222 -0.42001,-21.03965 -1.04541,-24.19558 -6.13017,-30.93443 -2.68089,-3.55299 -10.0834,-7.28665 -14.44684,-7.28665 -1.54763,0 -3.09198,-0.45 -3.4319,-1 -0.88203,-1.42715 -5.70202,-1.23593 -8.02749,0.31846 -1.37093,0.91636 -5.17481,1.26189 -12.47251,1.13296 -15.17146,-0.26803 -14.85205,-0.21256 -17.71591,-3.07642 -1.44375,-1.44375 -3.69204,-2.625 -4.99621,-2.625 -2.7182,0 -4.39961,1.30533 -2.53788,1.97024 2.36677,0.84527 1.24558,2.4121 -1.5,2.09618 -1.54669,-0.17796 -2.64061,-0.86338 -2.5,-1.56642 0.1375,-0.6875 -0.66005,-1.25 -1.77234,-1.25 -2.97897,0 -10.97766,-7.74345 -10.97766,-10.62736 0,-1.92736 -0.52126,-2.37264 -2.77749,-2.37264 -4.82229,0 -7.22251,-2.51128 -7.22251,-7.5567 0,-2.44382 0.45,-4.4433 1,-4.4433 0.55,0 1,-0.9 1,-2 0,-1.33333 -0.66667,-2 -2,-2 -1.72222,0 -2,-0.66667 -2,-4.8 0,-2.64 -0.46123,-5.26123 -1.02495,-5.82495 -0.56372,-0.56372 -1.2443,-4.3997 -1.51239,-8.52439 -0.46624,-7.17333 -0.3805,-7.55667 1.97191,-8.81564 3.48541,-1.86534 3.87722,-3.78462 1.13888,-5.57885 -1.51817,-0.99474 -2.19056,-2.20433 -1.88176,-3.38518 0.26426,-1.01055 -0.18138,-3.12743 -0.99031,-4.70418 -1.25671,-2.44954 -1.46588,-4.63858 -0.829,-8.67583 0.0702,-0.44496 0.54522,-0.55092 1.05562,-0.23548 1.51281,0.93497 1.97018,-2.52802 1.24883,-9.4555 -0.59722,-5.7355 -0.94146,-6.53758 -2.92683,-6.81955 -1.2375,-0.17575 -2.25,-0.73825 -2.25,-1.25 0,-1.27883 2.35901,-1.17144 3.69884,0.16839 0.79845,0.79845 1.28689,0.24261 1.78676,-2.03328 0.37836,-1.72266 1.88638,-4.42082 3.35116,-5.9959 2.3917,-2.5718 3.22402,-2.83614 8.16324,-2.59263 3.025,0.14914 8.02967,0.79772 11.1215,1.44128 5.2539,1.09362 6.00589,0.99806 11.5,-1.46134 5.71953,-2.56031 6.46674,-2.63587 27.63088,-2.79422 l 21.75238,-0.16275 3.24762,-3.79 c 6.45726,-7.53567 7.41332,-9.32893 8.90878,-16.71 1.63092,-8.04969 1.59003,-25.93333 -0.0876,-38.29499 -0.77123,-5.68291 -1.49681,-7.43108 -4.43344,-10.68157 l -3.51129,-3.88658 -0.62762,2.85752 c -0.59696,2.71797 -0.78325,2.80539 -3.81442,1.78997 -1.75275,-0.58716 -3.86181,-1.6027 -4.68681,-2.25676 -9.16359,-7.26488 -24.97147,-10.89779 -53.06949,-12.19626 -16.99074,-0.78517 -17.60989,-1.01049 -18.46608,-6.71994 -0.37036,-2.46979 -1.52638,-5.26246 -2.56891,-6.20594 -1.04252,-0.94349 -1.8955,-2.7182 -1.8955,-3.94381 0,-2.69917 -3.39284,-3.89815 -5.12496,-1.81107 -1.75621,2.1161 -2.84099,-0.10064 -2.85973,-5.84387 -0.0122,-3.72667 0.44243,-5.01391 2.2072,-6.25 1.22237,-0.85618 2.95014,-1.5567 3.83948,-1.5567 2.05763,0 3.93801,-4.08584 3.93801,-8.55684 0,-2.22525 0.71474,-4.07472 2,-5.17519 4.31612,-3.69558 1.54185,-6.75717 -7.25,-8.00084 -3.10259,-0.43889 -3.75,-0.93076 -3.75,-2.84911 0,-1.27525 0.6935,-2.70674 1.54112,-3.18109 0.84762,-0.47435 2.17056,-3.24854 2.93987,-6.16485 l 1.39874,-5.3024 -3.0002,-2.5245 c -2.11395,-1.77877 -2.68698,-2.83773 -1.93987,-3.58484 1.20114,-1.20114 1.45966,-12.92769 0.31034,-14.07701 -1.03465,-1.03465 -0.99778,-2.95631 0.0711,-3.70699 0.48843,-0.34301 2.14557,-0.149 3.68253,0.43114 2.21969,0.83784 3.32222,0.70901 5.36023,-0.62634 1.41116,-0.92463 3.72751,-1.68114 5.14744,-1.68114 1.78857,0 3.08377,-0.87482 4.21602,-2.84765 2.80222,-4.8826 8.57279,-7.17191 17.77265,-7.05083 4.4,0.0579 15.80499,-0.18018 25.34441,-0.52911 15.51915,-0.56764 17.83435,-0.88286 22,-2.99532 5.25911,-2.66697 7.57425,-4.95006 8.67791,-8.55775 0.41738,-1.36436 1.58827,-3.61436 2.60198,-5 2.93432,-4.01092 4.39818,-19.1679 3.23893,-33.53625 -0.8346,-10.34441 -1.41538,-12.93209 -4.17293,-18.59247 -2.99728,-6.15246 -5.89533,-8.87122 -9.48735,-8.90039 -0.66162,-0.005 -3.5969,-1.12424 -6.52284,-2.48637 -3.78095,-1.76018 -8.33731,-2.76251 -15.75074,-3.46494 -5.73697,-0.54358 -11.70509,-1.64726 -13.26249,-2.45262 -1.5574,-0.80537 -6.84457,-1.99687 -11.74926,-2.64779 -4.90469,-0.65092 -11.21866,-2.23748 -14.03105,-3.525694 -5.64966,-2.58782 -6.35229,-4.24117 -6.37556,-15.0023 -0.01,-4.45314 -0.32359,-5.23191 -2.51101,-6.22857 -2.31988,-1.057 -2.5,-1.64311 -2.5,-8.13483 0,-6.76165 0.10039,-7.04767 3,-8.54712 1.65,-0.85325 3,-1.9898 3,-2.52568 0,-1.06446 14.26228,-1.37871 15.30379,-0.3372 0.35042,0.35042 -0.24958,1.88239 -1.33334,3.40437 -1.08375,1.52199 -1.97045,3.49642 -1.97045,4.38763 0,3.30569 9.76002,4.82812 13.61994,2.12453 1.91567,-1.34179 2.0315,-2.19116 1.60235,-11.75 -0.25443,-5.66701 -0.83325,-10.445223 -1.28627,-10.618258 -2.1417,-0.818053 0.58652,-3.185392 3.671,-3.185392 2.34934,0 3.39301,-0.46139 3.39301,-1.5 0,-0.933333 -0.94444,-1.5 -2.5,-1.5 -2.4578,0 -2.5,-0.134688 -2.5,-7.979676 l 0,-7.979676 -4.03532,-2.058667 c -2.21943,-1.132266 -3.76787,-2.491412 -3.44098,-3.020324 0.32688,-0.528911 0.2142,-0.961657 -0.2504,-0.961657 -1.0993,0 -1.25629,-2.948328 -0.6001,-11.27022 0.41459,-5.257835 0.95438,-6.995282 2.41638,-7.777719 1.4769,-0.790414 2.2626,-0.546543 3.64647,1.131811 0.97017,1.176621 2.43493,2.840434 3.25502,3.697362 1.12218,1.172588 1.18403,1.660399 0.25,1.971742 -1.95761,0.652538 -1.48927,3.44467 0.50893,3.034096 1.01054,-0.207638 1.62515,-1.086719 1.45453,-2.080433 -0.26926,-1.568232 3.86017,-8.117643 6.28978,-9.975779 1.23264,-0.942706 20.16372,-0.375081 23.18966,0.695312 1.88443,0.666597 2.84451,-0.140039 7,-5.881243 9.17623,-12.677821 10.02217,-14.941673 10.83238,-28.988794 l 0.72421,-12.556135 540.95115,0 c 485.43759,0 541.10899,0.157823 542.48909,1.537903 1.0416,1.04168 1.3217,2.412994 0.8679,4.25 -1.8048,7.306762 -1.8199,8.540603 -0.1195,9.783968 0.9372,0.685298 1.7865,1.624476 1.8874,2.087063 0.1009,0.462586 0.5209,0.728566 0.9334,0.591066 0.4125,-0.1375 0.75,0.17011 0.75,0.683578 0,0.513467 1.2375,1.075967 2.75,1.25 2.3492,0.270299 2.7646,0.792582 2.85,3.583089 0.055,1.796666 0.3896,3.556265 0.7436,3.910219 0.9567,0.956775 8.7149,-1.598145 9.0577,-2.982867 0.1625,-0.65671 0.8523,-2.769019 1.5329,-4.694019 2.4815,-7.019013 2.4822,-7 -0.2563,-7 -2.2534,0 -2.6333,-0.520014 -3.2154,-4.401238 -0.363,-2.420681 -0.3602,-5.345681 0.01,-6.5 l 0.6623,-2.098762 56.4326,0 56.4326,0 0,508.500004 0,508.5 -647.25,-0.015 c -418.23825,-0.0102 -646.71927,-0.3586 -645.75,-0.985 z m 1182.5,-60.29605 c 3.9068,-2.21043 4.0046,-2.40018 4.1991,-8.14437 0.1095,-3.23466 -0.2438,-6.70884 -0.7852,-7.72039 -1.0352,-1.93431 -3.9139,-2.55154 -3.9139,-0.83919 0,0.55 -0.6592,1 -1.4648,1 -0.8057,0 -1.9465,0.9 -2.5352,2 -0.9411,1.75853 -0.7605,2 1.4962,2 4.1607,0 4.5963,5.46917 0.5432,6.82021 -0.7834,0.26112 -1.0346,-0.0189 -0.6196,-0.69048 0.384,-0.62135 0.2638,-1.12973 -0.2672,-1.12973 -0.5309,0 -0.73,-0.9 -0.4423,-2 0.2924,-1.11819 0.031,-2 -0.5937,-2 -0.9686,0 -1.6721,3.75849 -1.1933,6.37516 0.088,0.48134 -0.4652,1.60634 -1.2295,2.5 -0.7643,0.89366 -1.7096,2.18734 -2.1007,2.87484 -1.2021,2.11297 4.509,1.44225 8.9069,-1.04605 z M -116,217.5765 c 0,-1.1 -0.45,-2 -1,-2 -0.55,0 -1,0.9 -1,2 0,1.1 0.45,2 1,2 0.55,0 1,-0.9 1,-2 z M 1057.393,-39.005291 c 1.0587,-2.758981 0.6972,-3.737967 -0.893,-2.418213 -1.637,1.358564 -2.0378,4 -0.607,4 0.4912,0 1.1662,-0.711804 1.5,-1.581787 z M -83.75,59.128546 c -1.2375,-0.56447 -2.25,-1.83405 -2.25,-2.8213 0,-3.1789 2.7668,-8.535575 5.03602,-9.750027 1.48563,-0.795085 1.98352,-0.821353 1.52564,-0.08049 -0.37383,0.604871 -0.20314,1.099767 0.37932,1.099767 0.62536,0 1.05902,2.40921 1.05902,5.88337 0,6.43495 -1.28746,7.7042 -5.75,5.66868 z"
+         id="path3129"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#7a6457"
+         d="m -38,965.5765 c 1.33333,-0.8617 1.33333,-0.9779 0,-1.0461 -0.825,-0.042 0.56012,-1.0615 3.07804,-2.2653 5.30746,-2.5373 11.68466,-9.2418 14.92283,-15.6886 1.24316,-2.475 3.21051,-5.84751 4.37189,-7.49447 1.94384,-2.75659 2.09757,-4.18379 1.93509,-17.96562 -0.20098,-17.04816 -1.49219,-26.10044 -4.62892,-32.45207 -1.73026,-3.50364 -3.50543,-5.1544 -8.62094,-8.01676 -5.5209,-3.08919 -6.83025,-4.38862 -9.15717,-9.08784 -1.49333,-3.01578 -3.31943,-5.54383 -4.05799,-5.61789 -0.73855,-0.0741 -1.96138,-0.18656 -2.71739,-0.25 -0.75601,-0.0634 -3.57593,-2.38732 -6.2665,-5.16417 -2.69057,-2.77685 -5.35423,-4.76311 -5.91924,-4.41391 -0.56502,0.3492 -1.6826,0.0911 -2.4835,-0.57362 -1.67313,-1.38858 -2.07638,-11.96365 -0.4562,-11.96365 0.55,0 1,-0.9 1,-2 0,-1.29565 -0.66667,-2 -1.89301,-2 -3.23926,0 -4.38353,-6.86631 -1.60699,-9.64286 0.825,-0.825 1.5,-3.21275 1.5,-5.30612 0,-2.16328 -0.64745,-4.34347 -1.5,-5.05102 -0.825,-0.68469 -1.5,-2.24256 -1.5,-3.46193 0,-1.39442 -0.92761,-2.63969 -2.5,-3.35612 -2.36825,-1.07904 -2.5,-1.5675 -2.5,-9.26892 l 0,-8.12985 2.5,0.62746 c 2.1711,0.54492 2.5,0.29606 2.5,-1.89159 0,-2.02032 -0.49496,-2.51905 -2.5,-2.51905 -2.38889,0 -2.5,-0.26667 -2.5,-6 0,-3.33333 0.44444,-6 1,-6 0.55,0 1,-1.46489 1,-3.25531 0,-2.84858 0.46854,-3.42852 3.75,-4.64158 2.0625,-0.76244 5.72348,-1.33935 8.1355,-1.28202 2.41203,0.0573 5.33703,-0.41139 6.5,-1.04161 1.16298,-0.63022 3.82584,-1.02729 5.91748,-0.88237 2.09164,0.14491 4.79164,-0.37647 6,-1.15863 1.20836,-0.78216 3.42905,-1.72549 4.93486,-2.09629 1.80204,-0.44375 3.38922,-1.95047 4.64359,-4.40819 1.04816,-2.0537 2.85553,-4.59296 4.01638,-5.6428 2.47621,-2.23943 4.29287,-8.07763 4.69591,-15.0912 0.79613,-13.85412 0.37639,-25.3273 -1.11583,-30.5 -0.87265,-3.025 -1.81447,-6.625 -2.09294,-8 -0.27846,-1.375 -0.72231,-3.55132 -0.98633,-4.83627 -0.26402,-1.28495 -2.82421,-4.56123 -5.68932,-7.28062 -4.94695,-4.69535 -5.41075,-4.90945 -9.2093,-4.25132 -5.86263,1.01575 -7.80717,0.69641 -9.66029,-1.58646 -0.91316,-1.12493 -2.04813,-2.04533 -2.52216,-2.04533 -1.515,0 -8.17605,-5.97882 -8.77958,-7.88038 -0.32009,-1.00849 -1.58457,-2.31752 -2.80997,-2.90894 -1.2254,-0.59143 -1.74618,-1.10578 -1.15728,-1.143 1.13152,-0.0715 0.45559,-8.59806 -0.84893,-10.70881 -0.38487,-0.62274 -0.0297,-1.68834 0.78922,-2.36801 3.10762,-2.57909 1.6786,-3.72662 -4.51101,-3.62244 -3.31603,0.0558 -6.00685,0.55516 -6.01531,1.11629 -0.008,0.55841 -0.4632,0.34029 -1.01062,-0.48471 -0.54741,-0.825 -0.72873,-3.17116 -0.40292,-5.21369 0.50115,-3.14177 0.17357,-4.1325 -2.1271,-6.43317 l -2.71948,-2.71948 2.65105,-2.28033 c 3.80212,-3.27044 5.99086,-2.12232 5.33111,2.79647 l -0.51642,3.8502 3.90485,0 c 3.23817,0 3.90484,-0.34146 3.90484,-2 0,-1.46667 -0.66667,-2 -2.5,-2 -2.45833,0 -2.5,-0.13333 -2.5,-8 0,-7.72567 -0.0804,-8 -2.34501,-8 -3.47109,0 -5.65499,-3.02339 -5.65499,-7.82874 0,-3.78268 0.23289,-4.17126 2.5,-4.17126 2.06637,0 2.5,-0.48157 2.5,-2.77643 0,-2.62308 -0.21489,-2.75593 -3.89078,-2.40538 -4.6014,0.43882 -10.37715,-2.52912 -7.76576,-3.99052 0.82513,-0.46177 1.79617,-2.1869 2.15785,-3.83363 0.56813,-2.58671 1.10597,-2.99404 3.95324,-2.99404 2.71929,0 3.56717,0.56064 4.84824,3.20576 l 1.55259,3.20575 1.19778,-2.62884 c 0.65878,-1.44586 2.26632,-2.89702 3.57231,-3.2248 1.67395,-0.42014 2.37453,-1.30382 2.37453,-2.99513 0,-4.12984 1.05791,-5.56274 4.10699,-5.56274 1.59115,0 2.89301,-0.45 2.89301,-1 0,-0.55 -0.45,-1 -1,-1 -1.39259,0 -1.25314,-3.34686 0.2,-4.8 0.66,-0.66 2.25083,-1.2 3.53518,-1.2 1.28435,0 3.33185,-0.64676 4.55,-1.43725 1.21815,-0.79049 5.36482,-1.97448 9.21482,-2.6311 6.38287,-1.0886 7.37038,-1.59445 11.20118,-5.73778 2.31065,-2.49916 4.70631,-5.92766 5.32369,-7.6189 0.61739,-1.69123 1.75012,-4.42497 2.51719,-6.07497 1.08926,-2.34304 1.30588,-7.19992 0.98921,-22.17895 -0.38115,-18.02921 -0.55761,-19.49793 -2.94355,-24.5 -1.44351,-3.02627 -5.57348,-8.41473 -9.5764,-12.49456 -6.75131,-6.881 -8.80069,-8.04039 -15.51537,-8.77748 -1.29112,-0.14173 -3.08803,-0.99823 -3.99315,-1.90335 -0.90511,-0.90511 -1.95101,-1.65769 -2.32423,-1.67239 -1.42976,-0.0563 -8.74628,-7.60242 -9.91226,-10.22327 -1.12726,-2.53382 -2.69962,-3.26314 -6.06546,-2.81336 -0.97334,0.13007 -1.22412,-1.40762 -1,-6.13152 0.26903,-5.67022 0.52572,-6.3373 2.54915,-6.62467 2.78375,-0.39536 3.00268,-3.18045 0.25,-3.18045 -1.70137,0 -2,-0.66667 -2,-4.46482 0,-3.44136 0.45845,-4.71017 2,-5.53518 2.1534,-1.15246 2.88105,-7.33745 1,-8.5 -1.90065,-1.17467 -1.12075,-6.36501 1.13805,-7.57388 2.0325,-1.08776 2.10894,-1.64486 1.54848,-11.28518 -0.32426,-5.57752 -0.88887,-11.15344 -1.25468,-12.39094 -0.56546,-1.91289 -0.28859,-2.25 1.84793,-2.25 2.69616,0 8.72022,-5.89596 8.72022,-8.5348 0,-0.80586 0.64582,-1.4652 1.43515,-1.4652 0.78933,0 2.70183,-1.78191 4.25,-3.9598 1.79757,-2.52875 3.89904,-4.19913 5.81485,-4.62204 4.85004,-1.07062 9.81944,-4.03663 12.5,-7.46068 1.375,-1.75638 3.43338,-4.37783 4.57418,-5.82545 4.60066,-5.83801 6.23015,-28.30245 3.50815,-48.36387 -0.8306,-6.12161 -1.38688,-7.27622 -6.13671,-12.73722 -7.60509,-8.74375 -10.86548,-10.96805 -15.7893,-10.7717 -3.70982,0.14794 -4.46406,-0.26346 -7.87942,-4.29782 -5.48601,-6.48029 -10.44473,-10.96142 -12.12966,-10.96142 -1.26436,0 -2.0507,-8.07326 -0.99196,-10.18426 0.4646,-0.92634 0.84472,-3.57413 0.84472,-5.88398 0,-2.30985 0.51695,-5.92515 1.14878,-8.03401 0.88137,-2.94175 0.86801,-4.1726 -0.0574,-5.28766 -0.94406,-1.13752 -0.93005,-1.89555 0.0645,-3.48803 1.05464,-1.68875 0.96377,-2.88812 -0.5345,-7.05465 -2.06814,-5.75133 -1.56322,-11.35673 1.48897,-16.52981 1.04007,-1.7628 1.96816,-5.17315 2.06242,-7.57855 0.12334,-3.14778 0.82378,-4.97809 2.49931,-6.53092 1.4835,-1.37489 2.32792,-3.29476 2.32792,-5.2928 0,-1.72443 0.42648,-3.13533 0.94774,-3.13533 0.52126,0 1.08376,-2.3625 1.25,-5.25 l 0.30226,-5.25 4,-0.55477 c 4.32221,-0.59947 7.84007,-2.21514 11,-5.05206 1.1,-0.98756 3.41338,-2.9412 5.14085,-4.34142 1.72747,-1.40022 3.43487,-3.71732 3.79423,-5.14912 0.35936,-1.43179 1.52614,-3.79562 2.59285,-5.25295 3.04555,-4.16078 4.51391,-19.05816 3.32769,-33.7613 -1.21149,-15.01639 -3.51694,-20.1334 -14.05615,-31.19809 C -40.71524,105.55191 -44,101.33638 -44,100.39895 c 0,-0.937434 -0.45,-1.982534 -1,-2.322454 -0.55,-0.33992 -1.00561,-2.05398 -1.01247,-3.80902 -0.0126,-3.22481 -4.53904,-9.16821 -9.76921,-12.82735 -2.26494,-1.5846 -2.82884,-3.03009 -3.89195,-9.9765 -0.61017,-3.98692 3.02369,-17.10284 5.25048,-18.95091 0.71735,-0.59535 1.04044,-1.76996 0.71799,-2.61026 -0.32245,-0.840294 0.0418,-1.925503 0.80944,-2.411572 1.11717,-0.707388 1.04647,-0.886818 -0.35428,-0.899075 -2.85741,-0.025 -1.6956,-4.025538 2.45466,-8.452316 1.54891,-1.652106 1.80816,-2.911883 1.30165,-6.32507 -0.50784,-3.422175 -0.22592,-4.778928 1.43061,-6.884859 C -46.92839,23.487032 -46,21.494023 -46,20.500654 c 0,-0.993368 0.45122,-2.084991 1.0027,-2.425829 0.66365,-0.410155 0.64018,-1.297091 -0.0694,-2.62294 -0.69878,-1.305685 -0.73377,-2.416239 -0.10048,-3.189311 0.53439,-0.652343 1.45744,-2.986078 2.05121,-5.186078 1.04611,-3.87595 5.36614,-11.731267 13.59464,-24.719751 3.91718,-6.183177 3.99336,-6.485051 4.92882,-19.530249 l 0.95016,-13.25 540.8926,0 c 485.38485,0 541.05045,0.157823 542.43055,1.537903 1.0416,1.04168 1.3217,2.412994 0.8679,4.25 -1.8048,7.306762 -1.8199,8.540603 -0.1195,9.783968 0.9372,0.685298 1.7865,1.624476 1.8874,2.087063 0.1009,0.462586 0.5209,0.728566 0.9334,0.591066 0.4125,-0.1375 0.75,0.17011 0.75,0.683578 0,0.513467 1.2375,1.075967 2.75,1.25 2.3492,0.270299 2.7646,0.792582 2.85,3.583089 0.055,1.796666 0.3896,3.556265 0.7436,3.910219 0.9567,0.956775 8.7149,-1.598145 9.0577,-2.982867 0.1625,-0.65671 0.8523,-2.769019 1.5329,-4.694019 2.4815,-7.019013 2.4822,-7 -0.2563,-7 -2.2534,0 -2.6333,-0.520014 -3.2154,-4.401238 -0.363,-2.420681 -0.3602,-5.345681 0.01,-6.5 l 0.6623,-2.098762 56.4326,0 56.4326,0 0,508.500004 0,508.5 -615.25,-0.015 C 178.1711,966.5513 -38.96931,966.2029 -38,965.5765 z m 1118.5,-60.29605 c 3.9068,-2.21043 4.0046,-2.40018 4.1991,-8.14437 0.1095,-3.23466 -0.2438,-6.70884 -0.7852,-7.72039 -1.0352,-1.93431 -3.9139,-2.55154 -3.9139,-0.83919 0,0.55 -0.6592,1 -1.4648,1 -0.8057,0 -1.9465,0.9 -2.5352,2 -0.9411,1.75853 -0.7605,2 1.4962,2 4.1607,0 4.5963,5.46917 0.5432,6.82021 -0.7834,0.26112 -1.0346,-0.0189 -0.6196,-0.69048 0.384,-0.62135 0.2638,-1.12973 -0.2672,-1.12973 -0.5309,0 -0.73,-0.9 -0.4423,-2 0.2924,-1.11819 0.031,-2 -0.5937,-2 -0.9686,0 -1.6721,3.75849 -1.1933,6.37516 0.088,0.48134 -0.4652,1.60634 -1.2295,2.5 -0.7643,0.89366 -1.7096,2.18734 -2.1007,2.87484 -1.2021,2.11297 4.509,1.44225 8.9069,-1.04605 z M 399,717.65983 c 0,-3.82412 -0.44209,-6.0775 -1.25,-6.37143 -0.9243,-0.33627 -0.97202,-0.92683 -0.18317,-2.2665 1.58004,-2.6833 4.57807,-4.2539 5.14507,-2.6954 0.73348,2.01609 3.2881,1.43339 3.2881,-0.75 0,-1.1 -0.46753,-2 -1.03896,-2 -1.46145,0 2.21467,-3.74588 4.03896,-4.11561 0.825,-0.1672 2.48304,0.24048 3.68453,0.90595 1.52582,0.84511 2.95796,0.91589 4.74957,0.23472 1.41077,-0.53638 3.84182,-0.71988 5.40232,-0.40778 4.33743,0.86749 8.22177,-2.9539 8.87269,-8.72888 0.63834,-5.6633 3.24014,-7.8069 6.71343,-5.53111 2.20985,1.44795 2.25934,1.39389 2.41741,-2.6402 0.17261,-4.40496 1.31196,-6.35927 3.07292,-5.27094 1.83951,1.13688 1.21571,5.99928 -1.01466,7.90898 -1.60416,1.37352 -1.93669,2.43239 -1.40448,4.47224 0.38352,1.46994 0.92275,4.81013 1.1983,7.42263 0.39037,3.70115 0.89427,4.75 2.28204,4.75 2.29626,0 3.62401,1.70038 4.48991,5.75 0.44661,2.08867 0.3092,3.25 -0.38452,3.25 -0.59371,0 -1.07946,0.675 -1.07946,1.5 0,1 1,1.5 3,1.5 2.2963,0 3,-0.45238 3,-1.92857 0,-1.06072 0.675,-2.60357 1.5,-3.42857 0.825,-0.825 1.49311,-3.21965 1.48469,-5.32143 -0.0108,-2.70503 -0.28291,-3.39845 -0.93129,-2.37358 -0.72115,1.13987 -1.05579,0.8908 -1.57325,-1.17091 -0.80366,-3.20205 -0.32682,-5.91237 1.01985,-5.79664 0.55,0.0473 1.225,-1.61647 1.5,-3.69718 0.46014,-3.4815 0.77905,-3.80874 4,-4.10442 1.925,-0.17671 3.89525,-0.70696 4.37833,-1.17833 1.22837,-1.19858 4.53461,1.06294 3.9149,2.67786 C 468.70697,689.7825 463,690.07429 463,688.5765 c 0,-1.15772 -3.65514,-1.36701 -4.3462,-0.24886 -1.09116,1.76554 0.67815,10.43641 2.23583,10.9571 0.8857,0.29607 2.62907,1.72033 3.87415,3.16503 1.91137,2.21783 2.41491,2.39322 3.23468,1.12673 0.534,-0.825 0.97781,-4.3125 0.98623,-7.75 0.0116,-4.74285 0.3598,-6.25 1.44388,-6.25 0.78572,0 2.02899,-0.60042 2.76284,-1.33427 1.49647,-1.49647 8.92133,-2.94343 11.0036,-2.14439 0.92068,0.3533 1.2325,1.793 0.97443,4.49911 -0.28951,3.03578 -0.0246,3.97955 1.11712,3.97955 0.82314,0 1.77219,-1.09794 2.10899,-2.43987 0.49225,-1.96127 1.3472,-2.50071 4.35841,-2.75 3.59354,-0.2975 3.73911,-0.45261 3.57571,-3.81013 -0.50797,-10.43763 -1.45247,-14.09619 -3.87708,-15.01802 -1.3144,-0.49974 -2.96219,-1.82512 -3.66175,-2.9453 -1.16721,-1.86899 -2.28134,-2.03668 -13.53139,-2.03668 -7.5063,0 -12.25945,-0.38771 -12.25945,-1 0,-0.55 -0.9,-1 -2,-1 -3.29562,0 -2.32644,6.90769 1.19812,8.53937 2.93892,1.36058 2.76601,2.90696 -0.36554,3.26908 -2.09239,0.24196 -2.95657,-0.29698 -4.00873,-2.5 -1.05522,-2.20943 -2.19262,-2.9151 -5.33258,-3.30845 -3.49767,-0.43817 -4.03146,-0.85103 -4.31623,-3.33843 -0.37172,-3.24699 2.18089,-6.66157 4.97995,-6.66157 1.17834,0 1.84501,-0.72267 1.84501,-2 0,-1.1 -0.50078,-2 -1.11285,-2 -0.74865,0 -0.9836,-2.28735 -0.71791,-6.98931 0.23843,-4.21959 -0.0141,-7.17648 -0.63716,-7.46164 -0.56764,-0.25978 -0.0196,-1.21948 1.21792,-2.13266 1.71896,-1.26847 2.25,-2.6618 2.25,-5.9035 0,-5.35949 -2.76561,-9.05874 -7.42609,-9.93305 -2.19838,-0.41242 -3.68876,-1.36634 -4.08494,-2.61458 -0.74637,-2.35162 -1.80615,-2.49294 -3.48897,-0.46526 -2.17112,2.61604 -4,1.77781 -4,-1.83333 0,-1.83334 0.3375,-3.67084 0.75,-4.08334 0.4125,-0.4125 0.79963,-1.05 0.86029,-1.41666 0.62043,-3.75012 1.83972,-7.32676 2.67338,-7.84199 0.64878,-0.40097 0.71448,-0.11788 0.17888,0.77081 -0.7058,1.17111 -0.58049,1.18905 0.75407,0.10794 1.14407,-0.9268 3.12387,-1.08849 6.94196,-0.56694 4.42167,0.60399 4.91094,0.85314 2.84142,1.44689 l -2.5,0.71726 2.63606,0.0997 c 2.05123,0.0776 2.98734,-0.6406 4.21946,-3.23709 l 1.5834,-3.33676 5.58267,0.75758 c 3.07046,0.41667 6.29273,1.34689 7.16059,2.06715 1.40065,1.16244 1.50813,0.91855 0.95664,-2.17082 l -0.6213,-3.48038 1.41516,3.5 c 0.77834,1.925 1.4494,2.8824 1.49124,2.12756 0.0573,-1.0336 0.40741,-1.09747 1.41809,-0.25868 0.7381,0.61257 1.62201,0.83376 1.96424,0.49153 0.34223,-0.34222 2.21333,0.13279 4.15799,1.0556 4.0793,1.93575 4.58047,4.59631 1.78576,9.47998 -1.43556,2.5086 -1.52908,3.41322 -0.52048,5.03468 0.67624,1.08713 0.86377,2.20266 0.41673,2.47894 -0.44703,0.27628 -0.61956,1.81886 -0.3834,3.42794 0.23616,1.60908 -0.0639,3.23045 -0.66673,3.60305 -0.60287,0.37259 -1.09612,2.21004 -1.09612,4.08323 0,2.41456 -0.59909,3.72643 -2.0584,4.50743 -1.54301,0.82579 -1.98119,1.89874 -1.75,4.28518 0.25544,2.63691 0.7806,3.23789 3.0584,3.49998 2.47571,0.28486 2.75,0.70533 2.75,4.21556 l 0,3.89913 -5.03868,0.66841 c -3.02424,0.40118 -4.8914,1.11459 -4.6703,1.78444 0.48325,1.46405 13.67817,2.04685 15.05985,0.66517 2.15141,-2.15141 2.81949,-0.92325 2.14913,3.95087 l -0.68768,5 7.48685,0 c 5.21733,0 7.63795,0.39374 7.98529,1.2989 0.77521,2.02017 7.41193,3.77185 8.64796,2.28253 0.59868,-0.72137 4.04335,-1.27146 8.53567,-1.36309 L 530,667.64122 l 0,3.96764 0,3.96764 4.5,0 4.5,0 0,4 0,4 6,0 6,0 0,-6.44098 c 0,-3.63011 0.48307,-6.73954 1.10693,-7.12511 0.75271,-0.4652 0.93313,0.23593 0.5638,2.19098 -0.29873,1.58131 -0.17818,4.90011 0.2679,7.37511 0.67988,3.77228 0.84586,4.01485 1.02639,1.5 l 0.21536,-3 0.92194,3.18646 c 0.90356,3.12295 3.88572,5.057 5.88873,3.81907 0.55492,-0.34296 1.00895,-1.9102 1.00895,-3.48276 0,-4.8015 0.93418,-6.02277 4.60699,-6.02277 2.9292,0 3.39301,-0.33314 3.39301,-2.43713 0,-2.24511 -0.29546,-2.39479 -3.75,-1.89972 l -3.75,0.53741 2.90811,-2.43222 c 2.58116,-2.15877 2.83792,-2.87273 2.28377,-6.35028 -1.03411,-6.48943 -3.77078,-8.02137 -15.48225,-8.66671 -5.51786,-0.30405 -10.85983,-1.03381 -11.87105,-1.62168 -1.69898,-0.9877 -1.66775,-1.07116 0.41142,-1.09926 1.5732,-0.0213 2.25,-0.63201 2.25,-2.03041 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,0.45 -2,1 0,0.55556 -2.66667,1 -6,1 -5.73333,0 -6,-0.11111 -6,-2.5 0,-1.93708 -0.51437,-2.5 -2.28439,-2.5 -3.37422,0 -5.71561,-4.67176 -5.71561,-11.40429 l 0,-5.59571 4,0 c 3.33333,0 4,-0.33333 4,-2 0,-1.1 -0.45,-2 -1,-2 -0.55556,0 -1,-2.66667 -1,-6 0,-3.33333 0.44444,-6 1,-6 0.55,0 1,-0.9 1,-2 0,-3.24714 -3.79683,-2.60237 -4.18358,0.71045 -0.22653,1.94045 -1.02664,2.87496 -2.81642,3.2895 -2.03249,0.47075 -2.55804,1.27292 -2.81037,4.28954 -0.17924,2.14296 0.1376,3.71051 0.75,3.71051 0.58321,0 1.06037,0.45 1.06037,1 0,0.55431 -2.64453,1 -5.93358,1 -5.72962,0 -5.94445,0.0945 -6.25,2.75 -0.2511,2.18229 -0.83252,2.75 -2.81642,2.75 -2.08828,0 -2.58234,-0.56948 -3,-3.45787 -0.38483,-2.66136 -1.07356,-3.59259 -2.98998,-4.04272 -1.92372,-0.45185 -2.68143,-1.4848 -3.33181,-4.54213 -1.61401,-7.58719 -1.37508,-10.87254 0.82179,-11.29973 2.68984,-0.52306 3.46649,-1.95114 3.48469,-6.40755 0.0126,-3.07823 0.37359,-3.75 2.01531,-3.75 1.33333,0 2,-0.66667 2,-2 0,-1.40665 -0.66752,-2.00076 -2.25,-2.00257 -1.2375,-10e-4 -4.93496,-1.62155 -8.21657,-3.60029 -3.50032,-2.11062 -6.11817,-3.14292 -6.33333,-2.49743 -0.20172,0.60516 -1.53133,1.10029 -2.95469,1.10029 -1.42336,0 -3.45151,0.78153 -4.50699,1.73672 -1.82692,1.65334 -1.98793,1.64254 -3.35355,-0.22505 -1.20758,-1.65147 -1.74477,-1.768 -3.39611,-0.73672 -2.36548,1.47727 -5.98876,1.61343 -5.98876,0.22505 0,-1.65118 -7.98359,-1.15926 -9.7432,0.60034 -1.17259,1.1726 -2.62827,1.43597 -5.44618,0.98537 -4.23057,-0.6765 -9.08343,0.16386 -8.29675,1.43672 0.7032,1.13782 -5.84719,-1.30236 -6.77123,-2.52243 -0.45784,-0.60452 -1.50216,-0.0387 -2.64066,1.43077 -1.76406,2.27688 -1.9897,2.32436 -3.56407,0.75 -0.92442,-0.92442 -2.32362,-1.68077 -3.10934,-1.68077 -0.78571,0 -1.42857,-0.675 -1.42857,-1.5 0,-0.825 -0.9,-2.4 -2,-3.5 -1.24487,-1.24487 -2,-3.33333 -2,-5.53138 0,-2.21652 -0.55851,-3.74571 -1.5,-4.10699 -2.3833,-0.91456 -1.74132,-2.36163 1.04772,-2.36163 2.49029,0 2.541,-0.14088 2.25,-6.25 -0.28746,-6.03454 -0.39523,-6.26117 -3.12631,-6.57401 -2.11652,-0.24244 -2.67441,-0.72579 -2.21613,-1.92005 1.10145,-2.87033 -5.02352,-4.49343 -8.45528,-2.24063 -1.29203,0.84816 -1.30167,1.11232 -0.0696,1.90523 0.88708,0.57086 1.59749,3.22988 1.87019,7 l 0.43975,6.07946 -4.15537,0 c -2.28546,0 -5.26534,-0.72728 -6.62196,-1.61617 -1.35662,-0.88889 -3.36579,-1.38102 -4.46482,-1.09362 -1.09899,0.2874 -1.99819,0.0376 -1.99819,-0.55509 0,-2.47939 -3.40852,-4.73512 -7.15499,-4.73512 -2.11475,0 -3.84501,-0.45 -3.84501,-1 0,-0.55 -0.9,-1 -2,-1 -1.1,0 -2,-0.35964 -2,-0.79919 0,-0.99443 -8.58209,-0.95205 -9.58146,0.0473 -0.40138,0.40138 -0.99888,2.38529 -1.32778,4.4087 -0.99364,6.11304 -3.09076,5.38466 -3.09076,-1.0735 0,-5.95585 -1.47398,-7.2522 -4.64286,-4.08333 -1.55558,1.55558 -7.35714,2.10758 -7.35714,0.7 0,-1.41318 2.34521,-3.2 4.2,-3.2 1.33449,0 1.8,-0.7781 1.8,-3.00874 l 0,-3.00873 -5.75,0.65924 c -3.16449,0.36281 -6.82236,1.49087 -8.13486,2.50874 -3.1789,2.4653 -18.11514,2.75347 -18.11514,0.34951 0,-0.83333 -0.88889,-1.5 -2,-1.5 -1.11111,0 -2,0.66667 -2,1.5 0,0.825 0.87344,1.5 1.94098,1.5 1.06754,0 2.2017,0.42185 2.52036,0.93744 0.56148,0.90849 -12.64055,2.7128 -14.19873,1.94053 -0.41944,-0.20788 -0.62274,-1.60491 -0.45178,-3.10449 0.52395,-4.59604 -2.37833,-6.64743 -8.54368,-6.03885 l -5.23284,0.51653 0.0761,7.40755 c 0.0534,5.19841 -0.39902,8.13274 -1.51716,9.83923 -0.87631,1.33743 -1.5933,3.29938 -1.5933,4.35989 0,2.13966 -1.8124,3.12606 -5.83179,3.17397 -1.46751,0.0175 -3.54172,0.6925 -4.60934,1.5 -3.51622,2.65954 -8.81554,1.58201 -6.01125,-1.22228 1.25873,-1.25873 1.2619,-1.64285 0.0238,-2.88095 -0.78566,-0.78571 -2.32799,-1.42857 -3.42736,-1.42857 -1.09937,0 -2.88377,-1.125 -3.96535,-2.5 -1.08158,-1.375 -2.57674,-2.51431 -3.32258,-2.5318 -0.74584,-0.0175 -2.22959,-0.6925 -3.29721,-1.5 -1.06762,-0.80751 -3.65512,-1.4682 -5.75,-1.4682 -4.4069,0 -5.07807,-1.86598 -1.55887,-4.33397 1.9245,-1.34964 2.033,-1.72673 0.75,-2.60666 -0.825,-0.56581 -2.97662,-1.03564 -4.78138,-1.04406 -3.74955,-0.0175 -5.57394,-2.67733 -2.87311,-4.18879 0.90997,-0.50925 1.65449,-1.97395 1.65449,-3.25489 0,-3.55396 -4.14439,-4.76465 -14.33577,-4.18784 L 230,542.45065 l 0,-6.86752 c 0,-6.3535 -0.16841,-6.89322 -2.25,-7.21082 -1.2375,-0.18881 -2.1375,-0.89511 -2,-1.56955 0.16831,-0.82559 -1.23963,-1.22626 -4.30902,-1.22626 -2.50746,0 -4.31004,0.40285 -4.00574,0.89522 1.11357,1.80179 -2.2977,1.91424 -3.91333,0.129 -1.79263,-1.98085 -11.2778,-3.26235 -11.83118,-1.59847 -0.16935,0.50917 -0.13958,-2.19083 0.0661,-6 0.48862,-9.04659 0.65567,-9.42575 4.15277,-9.42575 1.6348,0 3.25048,-0.45 3.5904,-1 0.33992,-0.55 2.14592,-1 4.01333,-1 l 3.39529,0 0.29569,-6.75 0.29569,-6.75 3.88178,-0.31822 c 2.13498,-0.17502 4.36248,0.16248 4.95,0.75 0.75763,0.75763 -0.15296,1.06822 -3.13178,1.06822 l -4.2,0 0,5.30064 c 0,2.91534 -0.5625,6.51183 -1.25,7.99219 -1.17564,2.53146 -1.65152,2.69203 -8,2.69937 l -6.75,0.008 0,6 c 0,5.33333 0.22222,6 2,6 1.67097,0 2,-0.66667 2,-4.05226 l 0,-4.05226 5.25,0.30226 c 4.96363,0.28577 5.30219,0.47954 6.2068,3.55226 0.93694,3.18256 1.07701,3.25 6.75,3.25 4.79761,0 5.81713,-0.30075 5.93247,-1.75 0.0766,-0.9625 0.2067,-9.27577 0.28912,-18.47393 0.11865,-13.24063 -0.13195,-16.83207 -1.20314,-17.24313 -0.85349,-0.32751 -1.23712,-1.72156 -1.03912,-3.77606 0.25137,-2.6083 0.81172,-3.32575 2.81387,-3.6027 4.44073,-0.61427 4.83904,-1.66474 4.80751,-12.67893 -0.0219,-7.63809 -0.4001,-10.72217 -1.41866,-11.5675 -1.84122,-1.52807 -1.77353,-6.3436 0.11115,-7.90775 1.88307,-1.56281 1.93963,-6.01652 0.10821,-8.52112 -1.18252,-1.61719 -1.6336,-1.7027 -3,-0.56869 -1.06303,0.88224 -1.60821,0.95419 -1.60821,0.21225 0,-0.633 -1.65698,-1.12244 -3.8,-1.12244 -2.09,0 -4.34,-0.54 -5,-1.2 -2.04492,-2.04492 -1.38664,-4.71505 1.33055,-5.39702 1.7345,-0.43534 2.37859,-1.14912 2.04748,-2.26905 -1.52404,-5.15503 -1.71446,-7.13393 -0.68644,-7.13393 1.69906,0 1.31717,-2.12547 -0.64159,-3.57084 -1.62069,-1.1959 -1.56527,-1.36562 0.75,-2.29686 1.375,-0.55304 1.91094,-1.03405 1.19098,-1.06891 -0.71996,-0.0349 -1.01973,-0.53145 -0.66617,-1.10353 0.35356,-0.57208 -0.51988,-1.95474 -1.94098,-3.07258 -3.24984,-2.55632 -3.22498,-3.01542 0.27096,-5.0038 1.56317,-0.88908 3.06817,-2.48087 3.34443,-3.53729 0.70272,-2.6872 -0.83498,-6.34619 -2.667,-6.34619 -1.0358,0 -1.53222,-0.97196 -1.53222,-3 0,-2 0.5,-3 1.5,-3 0.83333,0 1.5,-0.88889 1.5,-2 0,-1.11111 -0.66667,-2 -1.5,-2 -1.16667,0 -1.5,-1.33333 -1.5,-6 l 0,-6 4,0 c 2.88889,0 4,-0.41667 4,-1.5 0,-1.16501 -1.32678,-1.5 -5.94098,-1.5 -8.24908,0 -8.43546,-1.60582 -0.29684,-2.55747 5.69091,-0.66545 6.27169,-0.89803 3.73782,-1.49688 -2.49476,-0.58961 -2.60904,-0.72895 -0.67857,-0.82734 3.99697,-0.20371 5.54176,-2.74433 5.38112,-8.84998 -0.11679,-4.43916 0.32219,-6.12404 2.23104,-8.56311 1.83126,-2.3399 2.13644,-3.42085 1.33028,-4.71172 -1.1938,-1.91157 -0.18472,-8.9935 1.28144,-8.9935 0.52508,0 0.95469,-0.95772 0.95469,-2.12827 0,-2.42549 5.47311,-12.45739 7.4247,-13.60905 1.59628,-0.94199 3.48011,-6.89473 3.24777,-10.26268 -0.13976,-2.02592 0.33996,-2.55913 2.52976,-2.81181 1.61519,-0.18638 2.94969,-1.0915 3.31739,-2.25 0.91583,-2.88553 3.48038,-2.41752 3.48038,0.63513 0,1.91072 0.45061,2.48776 1.75,2.24101 1.31861,-0.2504 1.82513,-1.50102 2.05479,-5.07332 l 0.30479,-4.74101 3.94521,0 c 2.16987,0 3.94521,-0.45 3.94521,-1 0,-0.55 1.69999,-1 3.77776,-1 2.62055,0 4.33804,-0.65436 5.60682,-2.13618 1.06666,-1.24578 2.09715,-1.71878 2.47224,-1.13479 0.35375,0.55078 1.62717,1.30833 2.82982,1.68347 1.21012,0.37746 2.32659,1.66577 2.5,2.88478 0.26946,1.89411 0.93808,2.20272 4.77236,2.20272 4.25301,0 4.49059,-0.15442 5.14265,-3.34265 0.92645,-4.52979 2.361,-5.8482 4.46418,-4.10272 1.41242,1.17221 1.82588,1.13016 2.86537,-0.29142 1.27445,-1.74293 7.40573,-2.44377 11.13866,-1.27322 2.73618,0.858 4.20284,-1.05355 4.60563,-6.00267 l 0.32451,-3.98732 7.97907,0.33375 c 6.77922,0.28356 8.60719,0.75766 12.15614,3.15282 5.686,3.83743 7.38943,4.23444 10.7291,2.50053 4.29198,-2.22833 8.63569,-1.97034 8.63569,0.5129 0,1.1 -0.1125,2.15584 -0.25,2.34631 -0.1375,0.19046 0.36426,1.08644 1.11502,1.99105 1.11526,1.3438 3.2195,1.62387 11.5,1.53063 8.36345,-0.0942 10.92155,0.25314 14.63498,1.98698 6.0418,2.82099 11.31325,2.81193 13.19536,-0.0227 1.30264,-1.96187 2.52488,-2.21119 12.87197,-2.62569 8.25806,-0.33081 11.65473,-0.8396 12.23236,-1.83229 1.3051,-2.24289 9.89672,-1.79372 11.96828,0.62569 1.2954,1.51292 2.94994,2 6.79367,2 5.2976,0 7.19478,1.08183 8.36544,4.77024 0.86467,2.72433 4.34182,2.48067 10.07292,-0.70587 4.24341,-2.35937 10.39962,-8.72266 10.46245,-10.81437 0.0263,-0.87611 2.10996,-1.25 6.96612,-1.25 4.8254,0 7.3839,-0.45533 8.42857,-1.5 2.00037,-2.00037 15.1742,-2.12263 16.34317,-0.15167 0.93627,1.57861 7.20374,2.98496 12.54969,2.81602 2.0625,-0.0652 3.75,0.32117 3.75,0.85857 0,0.53739 1.84814,0.97708 4.10699,0.97708 2.97775,0 3.96859,0.36065 3.60365,1.31168 -0.27684,0.72143 0.36774,2.40893 1.4324,3.75 l 1.93575,2.43832 1.67729,-2.39264 c 0.92251,-1.31596 1.69228,-3.34096 1.7106,-4.5 0.0198,-1.25201 0.59148,-1.98895 1.40848,-1.81564 2.7354,0.58027 5.12031,-2.92221 5.24084,-7.69671 0.0638,-2.52725 0.3218,-3.80751 0.57333,-2.84501 0.55037,2.10609 1.03181,2.14405 4.46621,0.35215 2.46888,-1.28814 2.98501,-1.15128 7.34299,1.94713 2.57811,1.83296 6.10811,3.61043 7.84447,3.94993 1.73635,0.3395 4.13402,1.09811 5.32816,1.68582 1.44884,0.71305 4.44307,0.77684 9,0.19176 l 6.82884,-0.87677 0,-5 c 0,-4.81623 -0.11026,-5.01202 -3,-5.32695 -5.08781,-0.55448 -5.32798,-2.17305 -0.32244,-2.17305 4.47121,0 8.49677,2.27522 5.68427,3.21272 -0.77135,0.25712 -0.94471,1.12232 -0.47032,2.34725 0.74143,1.91447 0.77001,1.91464 2.16958,0.013 0.78003,-1.05985 1.74736,-1.59788 2.14962,-1.19563 0.40225,0.40226 0.0824,1.13244 -0.71071,1.62263 -0.79314,0.49019 -1.056,1.25322 -0.58413,1.69563 0.47186,0.4424 1.05883,0.24187 1.30437,-0.44563 0.27499,-0.76998 2.33452,-1.25 5.36309,-1.25 3.80303,0 4.91667,0.35593 4.91667,1.57143 0,3.19006 2.52423,4.39069 7.89401,3.75472 2.80829,-0.3326 5.10599,-1.06912 5.10599,-1.6367 0,-0.56758 0.74997,-1.86068 1.66661,-2.87355 1.60796,-1.77678 2.90939,-7.29117 1.51709,-6.42823 -0.37603,0.23306 -0.76065,-3.02132 -0.85471,-7.23196 -0.0941,-4.21064 -0.47489,-10.27239 -0.84631,-13.47055 -0.56495,-4.86467 -0.3736,-6.14821 1.17101,-7.85499 1.01547,-1.12208 1.73381,-2.2179 1.59631,-2.43516 -0.1375,-0.21725 -0.17435,-2.98251 -0.0819,-6.14501 l 0.16811,-5.75 0.58189,6 c 0.4275,4.40805 0.97988,6 2.08189,6 1.08003,0 1.58534,-1.32991 1.80479,-4.75 0.25245,-3.93428 0.63885,-4.75 2.25,-4.75 1.60274,0 1.94521,0.70422 1.94521,4 0,3.77778 0.16667,4 3,4 2.33333,0 3,0.44444 3,2 0,1.77471 -0.66667,2 -5.91821,2 -8.73746,0 -9.08179,0.2654 -9.08179,7 0,6.61619 0.44313,7 8.08179,7 l 4.91821,0 0,-5 c 0,-2.75 0.28789,-5 0.63976,-5 1.11853,0 3.29543,3.43365 3.32844,5.25 0.0394,2.16763 4.0318,2.41519 4.0318,0.25 0,-0.825 -0.45,-1.5 -1,-1.5 -0.55625,0 -1,-2.67928 -1,-6.03785 0,-5.98986 0.0219,-6.03556 2.75,-5.75 l 2.75,0.28785 0.29381,-7.25 c 0.26054,-6.42908 0.51531,-7.25 2.25,-7.25 1.61556,0 1.95619,0.69653 1.95619,4 0,3.79661 1.15275,5.1799 2.5,3 0.33992,-0.55 1.71648,-1 3.05902,-1 3.10438,0 3.22406,2.53755 0.26807,5.68405 -2.03395,2.16505 -2.28975,2.20722 -4,0.65947 C 647.15682,232.40844 647,232.40555 647,233.88633 c 0,0.89089 0.9,2.10147 2,2.69017 1.1,0.5887 2,1.65979 2,2.3802 0,0.7204 0.88552,2.11121 1.96782,3.09068 1.48397,1.34297 1.72985,2.2255 1,3.58925 -1.69232,3.16213 -1.11942,5.93174 1.42731,6.9 1.31731,0.50084 2.55638,1.3944 2.75347,1.98568 0.5904,1.7712 12.8514,0.11889 12.8514,-1.73187 0,-1.25385 1.15315,-1.39397 7,-0.85056 l 7,0.65058 -0.0153,-3.75698 c -0.0193,-4.74364 -1.23801,-6.75748 -3.55195,-5.86954 -1.20848,0.46373 -2.74574,-0.25216 -4.85093,-2.25906 -1.69499,-1.61586 -3.98181,-3.09716 -5.08181,-3.29178 -1.56882,-0.27757 -2.06643,-1.27111 -2.30815,-4.60851 -0.32846,-4.53519 0.83113,-6.46583 4.60247,-7.66281 1.21057,-0.38422 2.47586,-1.79359 2.81176,-3.13193 0.3359,-1.33834 1.01194,-2.43335 1.50232,-2.43335 0.49037,0 0.89159,-1.09468 0.89159,-2.43261 0,-2.70931 2.73033,-4.10514 6,-3.06739 1.19199,0.37832 2,0.1797 2,-0.49163 0,-0.61952 -0.45,-0.84829 -1,-0.50837 -1.88995,1.16805 -0.99907,-1.05915 1,-2.5 1.1,-0.79284 2.0522,-2.35468 2.116,-3.47076 0.1002,-1.7528 0.17956,-1.78429 0.58258,-0.2312 0.25661,0.98892 -0.0757,2.45142 -0.73845,3.25 -1.01569,1.22383 -0.63588,1.45196 2.41743,1.45196 3.19727,0 3.62244,-0.29343 3.62244,-2.5 0,-2.25 0.4,-2.5 4,-2.5 3.90476,0 4,-0.0833 4,-3.5 l 0,-3.5 -8,0 -8,0 0,-4 c 0,-2.2 -0.45,-4 -1,-4 -0.55,0 -1,-0.70156 -1,-1.55902 0,-0.85746 0.45,-1.2809 1,-0.94098 0.57378,0.35462 1.01356,-0.57922 1.0318,-2.19098 0.0175,-1.54496 0.68487,-3.6721 1.48306,-4.72698 1.92852,-2.5487 0.25636,-4.58204 -3.76815,-4.58204 -2.93042,0 -2.99079,0.0972 -2.32933,3.75 1.40661,7.76775 1.81768,15.21306 1.1396,20.64024 -0.67171,5.37618 -0.82281,5.60976 -3.62894,5.60976 -3.25755,0 -3.96334,-1.496 -1.06354,-2.25431 1.2187,-0.3187 2.11097,-1.8014 2.5761,-4.28074 0.85261,-4.5448 -0.31335,-20.26827 -1.56011,-21.03881 C 679.39622,179.70334 679,178.6361 679,177.63098 c 0,-1.92749 -3.27526,-3.03323 -10,-3.37605 -2.52374,-0.12866 -3.5,0.23997 -3.5,1.32157 0,1.08003 1.32991,1.58534 4.75,1.80479 2.6125,0.16764 4.75,0.58863 4.75,0.93555 0,1.43931 -4.48471,5.25966 -6.17431,5.25966 -2.73248,0 -2.3606,3.76519 0.42431,4.29604 1.2375,0.23589 0.9,0.31966 -0.75,0.18616 -1.65,-0.13351 -3.70306,0.12402 -4.56235,0.57229 -1.34431,0.70128 -1.48286,0.16124 -0.99275,-3.86973 0.31328,-2.57662 0.41386,-7.49726 0.22353,-10.93476 l -0.34607,-6.25 -5.91118,0 -5.91118,0 -0.0304,4.75 c -0.0263,4.10278 -0.18942,4.47748 -1.1974,2.75 -0.64184,-1.1 -1.05552,-3.35 -0.91928,-5 0.42569,-5.15547 -1.48821,-6.53263 -8.10291,-5.83052 -3.88242,0.41209 -5.75,1.05208 -5.75,1.97042 0,0.9128 -1.27437,1.3601 -3.875,1.3601 -3.47792,0 -3.93457,-0.29786 -4.45635,-2.90673 -0.46448,-2.32242 -1.68327,-3.42802 -6.06307,-5.5 -7.0972,-3.35751 -10.35456,-3.38369 -11.60558,-0.0933 -0.82058,2.15828 -1.56898,2.5 -5.47525,2.5 -2.48862,3e-5 -4.52476,-0.43883 -4.52476,-0.97522 0,-0.6266 -0.94333,-0.61659 -2.63869,0.028 -1.45128,0.55177 -2.72213,0.87814 -2.82412,0.72525 -0.10198,-0.15289 -0.97358,-1.99265 -1.93688,-4.08836 -0.9633,-2.09572 -2.50495,-4.08789 -3.42588,-4.42706 -2.18431,-0.80446 -3.14023,-2.27352 -3.15912,-4.85496 -0.0138,-1.88623 -0.65875,-2.11324 -6.54551,-2.30381 -3.59161,-0.11627 -8.20411,0.32635 -10.25,0.98361 -2.04589,0.65727 -4.1698,1.29919 -4.7198,1.42649 -0.55,0.12731 -1.45,0.33314 -2,0.4574 -0.55,0.12427 -1.78534,0.64624 -2.74521,1.15994 -1.25776,0.67314 -2.86278,0.29647 -5.74651,-1.34861 -3.90913,-2.23003 -4.07365,-2.24157 -7.14105,-0.50093 -2.94374,1.67047 -3.25567,1.67675 -4.99728,0.10061 -1.02166,-0.92458 -3.76666,-1.87197 -6.1,-2.10531 -2.33335,-0.23333 -4.69864,-0.79432 -5.2562,-1.24665 -1.57348,-1.27649 -8.61464,-3.00261 -7.96582,-1.9528 0.66814,1.08109 0.21162,1.15116 -1.99167,0.30568 -1.18814,-0.45593 -1.3272,-0.9543 -0.53323,-1.91098 0.74582,-0.89865 0.75362,-1.49224 0.0255,-1.94223 -1.4904,-0.92112 -3.28124,0.42126 -2.6738,2.00422 0.32867,0.85651 -0.55162,1.56534 -2.46622,1.98586 -1.63753,0.35966 -3.94647,1.96477 -5.13099,3.56692 -2.3487,3.17679 -3.77755,3.73093 -3.77755,1.46501 0,-1.17942 -0.56488,-1.25106 -3.0456,-0.38628 -2.45603,0.85618 -3.39078,0.74932 -4.82874,-0.55202 -2.10537,-1.90534 -6.22527,-2.11411 -7.93717,-0.40221 -1.83587,1.83587 -9.33496,0.95163 -11.86446,-1.39897 -1.28271,-1.19199 -2.68664,-1.70647 -3.41994,-1.25326 -0.89483,0.55303 -1.05525,0.2316 -0.57158,-1.14524 0.65189,-1.85565 0.62657,-1.85483 -0.83006,0.0271 -0.82635,1.06762 -1.50245,1.46022 -1.50245,0.87244 0,-0.58777 0.675,-1.62888 1.5,-2.31357 1.97151,-1.63621 1.9069,-3.62988 -0.14313,-4.41655 -2.03615,-0.78135 -2.64603,-0.21117 -2.85274,2.66704 -0.14222,1.98034 -0.83521,2.31036 -5.79139,2.75806 -3.09641,0.2797 -6.18849,1.0672 -6.87129,1.75 -0.6828,0.6828 -2.85243,1.24145 -4.8214,1.24145 -2.7959,0 -4.30299,-0.76655 -6.88125,-3.5 -2.79462,-2.96283 -3.97224,-3.5 -7.67299,-3.5 -2.40444,0 -5.55122,-0.53742 -6.99285,-1.19427 -2.03169,-0.9257 -3.0512,-0.9257 -4.53348,0 -1.05179,0.65685 -3.74501,1.19427 -5.98493,1.19427 -2.46041,0 -3.82793,0.39586 -3.45455,1 0.97368,1.57544 -5.75045,1.12514 -7.94113,-0.5318 -1.06762,-0.80751 -1.51762,-1.49672 -1,-1.53159 0.51762,-0.0349 -0.0752,-0.47176 -1.31728,-0.97088 -2.67804,-1.07612 -18.04498,0.62621 -19.95388,2.21046 -0.70192,0.58254 -2.4363,0.8374 -3.85419,0.56635 -2.03388,-0.3888 -2.76855,0.008 -3.48099,1.88233 -0.84136,2.21292 -1.42261,2.37513 -8.51111,2.37513 -5.32911,0 -7.49221,-0.34763 -7.22125,-1.1605 0.50689,-1.52069 -3.52383,-5.8395 -5.44998,-5.8395 -0.82526,0 -2.6332,0.891 -4.01764,1.98001 -1.38444,1.089 -3.58263,2.44379 -4.88486,3.01064 -1.30223,0.56685 -4.16769,2.10676 -6.36769,3.42202 -2.2,1.31526 -4.33409,2.18602 -4.74242,1.93502 -1.2342,-0.75864 -10.641,-0.7976 -11.39143,-0.0472 -1.36007,1.36007 -4.45523,0.66835 -8.53586,-1.90764 -3.40052,-2.14666 -5.20739,-2.57861 -10.23013,-2.44561 -9.40202,0.24895 -10.61205,0.45045 -11.51798,1.91808 -0.84332,1.3662 -7.25518,1.22128 -20.40443,-0.4612 -4.0208,-0.51447 -5.18675,-0.27459 -7.01546,1.44339 -1.55298,1.45895 -2.62656,1.78641 -3.67775,1.12176 -0.8165,-0.51627 -3.39704,-0.94556 -5.73454,-0.95398 C 256.9125,145.58339 255,145.1265 255,144.5765 c 0,-0.55 -1.125,-1 -2.5,-1 -1.375,0 -3.43479,-0.93479 -4.57732,-2.07732 -1.36332,-1.36332 -2.65224,-1.82326 -3.75,-1.33816 -0.91997,0.40654 -3.36018,0.9386 -5.42268,1.18236 -3.20941,0.3793 -3.75,0.80174 -3.75,2.93043 0,1.36798 -0.9,3.6314 -2,5.02982 -1.48095,1.88272 -2,2.1183 -2,0.90773 0,-0.97187 -0.81658,-1.63486 -2.01357,-1.63486 -1.10746,0 -2.887,-0.54547 -3.95452,-1.21215 -1.06752,-0.66667 -2.23148,-0.92161 -2.58657,-0.56653 -1.10218,1.10219 0.56827,2.77868 2.76866,2.77868 2.03263,0 2.04128,0.0604 0.286,2 -1.88049,2.07792 -8.5,2.86714 -8.5,1.01342 0,-0.54262 -1.575,-1.64466 -3.5,-2.44897 -1.925,-0.80432 -3.5,-1.93536 -3.5,-2.51342 0,-2.03584 -5.10824,-1.03728 -7.41242,1.44897 -1.51139,1.63082 -3.39476,2.5 -5.41707,2.5 -2.07669,0 -3.4535,0.66026 -4.17051,2 -0.5887,1.1 -2.09353,2 -3.34405,2 -1.25053,0 -3.1472,0.66069 -4.21482,1.4682 -2.30383,1.74253 -6.59852,1.97441 -8.13377,0.43916 -1.45535,-1.45535 -4.9503,0.3923 -5.79878,3.0656 -0.34477,1.08629 -1.95025,2.91741 -3.56772,4.06915 -1.83991,1.31013 -2.94086,2.9824 -2.94086,4.46697 0,1.30509 -0.46381,2.65953 -1.03068,3.00988 -1.2166,0.7519 -0.24921,7.26904 1.40734,9.48104 2.82956,3.77832 3.22492,6.10233 3.01962,17.75 -0.17583,9.97605 0.0458,12.25 1.1939,12.25 1.13477,0 1.40982,2.34117 1.40982,12 0,7.33333 0.38889,12 1,12 0.55,0 1,1.99234 1,4.42742 0,3.53151 -0.50588,4.82535 -2.5,6.39392 -1.99828,1.57185 -2.49227,2.84071 -2.46148,6.32258 0.0336,3.7954 0.45045,4.61523 3.23888,6.36946 3.84347,2.41797 4.48936,4.73033 2.00414,7.17514 -1.63665,1.61004 -1.68934,2.12051 -0.47377,4.59049 1.02467,2.08208 1.10792,3.52408 0.33196,5.75 -0.63107,1.81029 -0.66534,2.97099 -0.0877,2.97099 1.48899,0 1.10803,3.69709 -0.55202,5.35714 -1.67815,1.67815 -2.01315,6.72971 -0.54372,8.19914 0.52595,0.52595 1.23587,4.55345 1.5776,8.95 l 0.62132,7.99372 -3.90521,1.75 c -4.92157,2.20545 -8.18193,2.22533 -9.76559,0.0596 -1.11004,-1.51808 -1.40814,-1.35772 -2.9235,1.57267 -1.64878,3.18839 -1.62872,3.34007 0.87584,6.62372 1.40979,1.84833 2.56326,3.89372 2.56326,4.54531 0,0.65159 1.39041,2.7683 3.08979,4.70379 3.21679,3.66372 3.46121,6.31183 1.35226,14.65127 -0.56818,2.24678 -0.31125,3.21616 1.13219,4.27162 1.13607,0.83072 1.96009,2.81798 2.1045,5.0754 0.16968,2.6523 0.9621,4.23804 2.7793,5.56179 3.18272,2.31845 3.17956,3.18946 -0.0223,6.15689 l -2.5643,2.37651 2.75966,4.32574 c 1.51782,2.37915 3.68426,5.39996 4.81431,6.71291 1.59086,1.84833 1.74694,2.4964 0.69149,2.87105 -1.15087,0.40852 -1.15087,0.61837 0,1.34751 0.99822,0.63243 1.02851,0.86773 0.11315,0.87895 -0.6875,0.008 -1.25,1.22086 -1.25,2.69431 0,4.30365 -2.23922,9.61975 -5.22737,12.4102 -2.53099,2.36355 -2.77263,3.21327 -2.77263,9.75 0,6.97152 -0.0661,7.1608 -2.5,7.1608 -2.3923,0 -2.5,0.2617 -2.5,6.07451 l 0,6.07451 11.25,-0.15808 c 13.64326,-0.1917 14.25407,-0.16168 13.43221,0.66018 -0.35812,0.35812 0.12938,1.24381 1.08333,1.9682 1.64411,1.24847 1.6433,1.31873 -0.0155,1.34888 -1.37446,0.025 -1.76694,0.94382 -1.82895,4.2818 -0.0434,2.3375 -0.30685,3.6847 -0.58541,2.99377 -0.27855,-0.69093 -0.86704,-1.03338 -1.30774,-0.76101 -0.44071,0.27237 -1.35737,-0.17483 -2.03704,-0.99377 -1.86577,-2.24812 -3.73376,-1.79771 -5.19586,1.25285 -0.8721,1.81959 -2.31999,2.91437 -4.30456,3.25479 -2.72187,0.46689 -3.01858,0.90484 -3.30371,4.87636 -0.24542,3.41826 0.1714,4.87932 1.92431,6.74521 1.23067,1.30999 2.79202,2.3818 3.46965,2.3818 0.7398,0 1.05843,0.89898 0.79748,2.25 l -0.43459,2.25 0.99599,-2.25 c 0.65026,-1.46899 1.86503,-2.25 3.49961,-2.25 1.98637,0 2.67645,0.67147 3.34007,3.25 0.73218,2.84487 1.2993,3.28884 4.54953,3.56161 3.72632,0.31273 4.25103,2.18839 0.6122,2.18839 -1.25464,0 -1.94098,0.68634 -1.94098,1.94098 0,1.06754 -0.45,2.2191 -1,2.55902 -0.55,0.33992 -1.00557,2.05398 -1.01238,3.80902 -0.01,2.53703 -0.72425,3.65209 -3.48597,5.44098 -1.91048,1.2375 -3.81741,2.26107 -4.23763,2.2746 -1.17335,0.0378 -4.26402,6.77666 -4.26402,9.29726 0,1.5776 0.90019,2.57945 3.04522,3.38911 l 3.04522,1.14944 -0.29522,7.31979 c -0.26161,6.48636 -0.55141,7.4322 -2.54522,8.30693 -2.31251,1.01455 -3.04505,2.51287 -1.22856,2.51287 0.56179,0 1.53402,1.125 2.16051,2.5 0.81747,1.79413 1.92414,2.5 3.91955,2.5 1.52926,0 3.05858,-0.45 3.3985,-1 1.37804,-2.22971 6.12708,-0.97997 9.5,2.5 1.86578,1.925 3.97906,3.5 4.69617,3.5 1.80001,0 1.64507,2.65508 -0.19617,3.36163 -0.96114,0.36882 -1.50799,1.93404 -1.52224,4.35699 -0.013,2.20486 -0.83752,4.82367 -1.97776,6.28138 -1.29804,1.65945 -1.963,4.08122 -1.97776,7.20295 -0.0122,2.58662 -0.55827,5.87939 -1.21341,7.31728 -0.97146,2.13212 -0.8938,3.20138 0.42106,5.79705 1.0382,2.04952 1.83773,7.19201 2.24556,14.44324 0.54271,9.64937 0.41092,11.34585 -0.92106,11.85698 -1.14599,0.43976 -1.56275,2.07913 -1.58619,6.23949 -0.019,3.3682 -0.62367,6.42552 -1.5,7.58414 -2.60799,3.44807 -1.85571,6.49901 1.99968,8.1099 1.90734,0.79693 4.38234,1.44897 5.5,1.44897 1.84929,0 2.03212,0.62979 2.03212,7 0,3.85 -0.3375,7.00082 -0.75,7.00182 -0.4125,10e-4 -0.59753,-2.699 -0.41118,-6 l 0.33872,-6.00186 -3.58882,0 c -2.5234,0 -3.58882,0.44531 -3.58882,1.5 0,0.825 0.62969,1.5 1.39931,1.5 1.46563,0 2.78286,8.76938 1.44173,9.59824 -0.37794,0.23358 -0.97229,1.72287 -1.32078,3.30954 -0.34849,1.58666 -1.50811,3.67624 -2.57694,4.64352 -1.53945,1.39318 -1.94332,3.09099 -1.94332,8.16943 0,3.52591 -0.48587,7.3186 -1.0797,8.4282 -1.29566,2.42095 1.00405,5.55622 4.43413,6.0452 1.95322,0.27845 2.17175,1.00066 2.43763,8.05587 0.2676,7.10073 0.46712,7.75 2.38151,7.75 1.97631,0 2.06338,-0.40608 1.60812,-7.5 -0.48581,-7.56995 -0.054,-8.73794 2.21831,-6 0.75964,0.91531 2.95124,1.5 5.62244,1.5 3.71089,0 4.37756,0.30458 4.37756,2 0,1.71119 -0.66667,2 -4.61663,2 -4.29961,0 -4.57523,0.15451 -4.01366,2.25 0.33164,1.2375 0.60913,2.8125 0.61664,3.5 0.009,0.84683 1.7876,1.25 5.51365,1.25 l 5.5,0 0.0153,-9.75 c 0.008,-5.3625 0.45153,-10.425 0.98469,-11.25 0.53316,-0.825 1.0355,-1.05 1.11633,-0.5 0.0808,0.55 0.42521,-0.575 0.76531,-2.5 0.60529,-3.42603 0.72931,-3.50639 5.86836,-3.80226 3.70432,-0.21327 5.25,0.0671 5.25,0.95239 0,0.69006 1.41516,2.71473 3.1448,4.49927 l 3.1448,3.24461 -0.8948,7.30299 c -0.84688,6.91194 -1.03814,7.31957 -3.57162,7.61236 -3.4156,0.39474 -4.57805,1.8374 -4.99148,6.19465 -0.28194,2.97157 -0.74422,3.54346 -3.0817,3.81241 -1.574,0.18111 -2.75,0.92947 -2.75,1.75 0,1.75997 3.65762,1.91656 4.2881,0.18358 0.72648,-1.99687 4.28051,0.66013 3.86353,2.88839 -0.1916,1.02389 -0.57441,3.77411 -0.85069,6.11161 l -0.50233,4.25 -5.3993,0 c -2.96961,0 -5.3993,-0.45 -5.3993,-1 0,-0.58333 -3.33333,-1 -8,-1 l -8,0 -0.0136,-4.75 c -0.0216,-7.52198 -0.76758,-9.11833 -4.59654,-9.83665 C 192.52542,670.64009 191,669.99613 191,669.55883 c 0,-0.98814 -4.03642,-0.0573 -5.81911,1.3419 -0.94747,0.74367 -1.13839,2.46383 -0.67766,6.10557 1.07263,8.47852 1.1375,8.5702 6.06416,8.5702 4.25846,0 4.43261,0.11787 4.43261,3 0,2.83333 0.22222,3 4,3 2.88889,0 4,0.41667 4,1.5 0,0.83333 0.88889,1.5 2,1.5 1.11111,0 2,-0.66667 2,-1.5 0,-0.9938 0.99391,-1.5 2.94521,-1.5 2.80414,0 2.95981,0.22752 3.25,4.75 l 0.30479,4.75 6.75,0.29569 c 6.74341,0.2954 6.75,0.29857 6.75,3.25 0,2.28764 0.45132,2.95431 2,2.95431 1.61905,0 2,-0.66667 2,-3.5 0,-2.83333 0.38095,-3.5 2,-3.5 1.61378,0 2,0.66667 2,3.45228 l 0,3.45229 6.24085,0.29771 c 5.69095,0.27149 6.35662,0.54003 7.55457,3.04772 1.65801,3.47073 6.53079,3.87751 8.23792,0.68771 1.0457,-1.95391 1.65194,-2.02557 11.53518,-1.36353 L 279,710.84944 l 0,-3.52948 c 0,-4.26331 0.97128,-4.74346 9.59536,-4.74346 3.53748,0 7.28659,-0.53384 8.33137,-1.18631 1.46571,-0.91536 3.68954,-0.91385 9.73643,0.007 4.31026,0.6561 9.69759,1.18994 11.97183,1.18631 3.32508,-0.005 4.45992,0.4893 5.79393,2.52526 0.91242,1.39252 2.05678,2.28599 2.54302,1.98547 0.48624,-0.30051 1.17179,0.36015 1.52345,1.46814 0.54007,1.7016 1.50427,2.01452 6.20733,2.01452 4.63021,0 5.95183,0.41423 7.84738,2.45956 1.25369,1.35275 3.55529,2.74034 5.11467,3.08351 1.55938,0.34318 4.26745,1.34741 6.01795,2.23162 2.59441,1.31049 3.66596,1.38747 5.79705,0.41648 1.43789,-0.65553 3.71816,-1.19156 5.06728,-1.19156 1.80005,0 2.45295,-0.54146 2.45295,-2.03426 0,-1.9667 0.43171,-2.01785 13,-1.54001 7.98202,0.30347 13,0.12369 13,-0.46574 0,-0.52799 0.45,-0.95999 1,-0.95999 0.55,0 1,0.87344 1,1.94098 0,1.06754 -0.45,2.2191 -1,2.55902 -0.55,0.33992 -1,1.94148 -1,3.55902 0,2.60109 0.34671,2.94098 3,2.94098 2.99531,0 3,-0.009 3,-5.91667 z m -21,-28.02431 c 0,-1.68246 0.45,-3.05902 1,-3.05902 0.55,0 1,1.09844 1,2.44098 0,1.34254 -0.45,2.7191 -1,3.05902 -0.58342,0.36058 -1,-0.65628 -1,-2.44098 z m 48.59556,-5.9044 c -0.28736,-0.46496 -0.82303,-2.72494 -1.19037,-5.02217 -0.36734,-2.29722 -1.05879,-4.41836 -1.53654,-4.71363 C 423.39089,673.70005 423,671.31346 423,668.6918 c 0,-3.68958 0.52298,-5.25799 2.31445,-6.94099 1.27295,-1.19587 2.62295,-2.17431 3,-2.17431 0.37705,0 0.68555,2.475 0.68555,5.5 0,3.025 0.45,5.5 1,5.5 0.57143,0 1,3 1,7 0,6.26239 -0.20453,7 -1.94098,7 -1.06754,0 -2.1761,-0.38042 -2.46346,-0.84538 z m 1.95773,-11.93467 c -1.2797,-1.2797 -1.55675,0.8563 -0.82864,6.38873 l 0.77535,5.89132 0.30329,-5.86338 c 0.1668,-3.22486 0.0543,-6.11236 -0.25,-6.41667 z M 410,663.63552 c 0,-4.91754 0.45,-9.2191 1,-9.55902 0.64003,-0.39556 1,2.82295 1,8.94098 0,5.70601 -0.40308,9.55902 -1,9.55902 -0.5921,0 -1,-3.64699 -1,-8.94098 z m 29,-5.85902 0,-6.2 -7.2,0 c -5.02478,0 -6.88304,-0.31696 -6.15087,-1.04913 0.59328,-0.59328 4.04755,-0.91916 7.95,-0.75 l 6.90087,0.29913 0.30425,5.89575 c 0.16734,3.24266 -0.17016,6.37016 -0.75,6.95 -0.739,0.739 -1.05425,-0.79971 -1.05425,-5.14575 z m 80,2.8 c 0,-3 0,-3 6,-3 6,0 6,0 6,3 0,3 0,3 -6,3 -6,0 -6,0 -6,-3 z m -169.57322,-2.63198 c -0.59028,-0.22926 -0.86954,-1.80466 -0.62059,-3.50089 0.41333,-2.81617 0.2574,-3.02209 -1.79508,-2.37065 -1.65504,0.52528 -2.12952,0.35612 -1.79943,-0.64154 0.30754,-0.92949 2.65783,-1.44635 7.48509,-1.64606 l 7.03678,-0.29112 0.64573,3.22862 c 0.35514,1.77574 0.30259,3.53591 -0.11678,3.91149 -0.95341,0.85385 -9.38556,1.87338 -10.83572,1.31015 z m -91.03464,-5.40055 c 0.57317,-4.92276 2.15213,-5.75126 5.03415,-2.64151 1.66976,1.80171 3.49964,2.67404 5.60929,2.67404 2.05849,0 2.9896,0.42821 2.71806,1.25 -0.26137,0.79101 -2.85709,1.35846 -7.06909,1.54537 l -6.65606,0.29536 0.36365,-3.12326 z m 128.30171,0.39305 c -1.01719,-1.01719 0.25764,-2.36052 2.24017,-2.36052 1.20086,0 2.01105,-0.97534 2.39187,-2.87946 1.19645,-5.98224 7.80669,-8.53223 9.63718,-3.71768 0.50246,1.32157 1.37167,2.68599 1.93157,3.03203 0.55991,0.34604 0.78583,1.23423 0.50204,1.97376 -0.32361,0.84332 0.53148,1.64321 2.29368,2.14559 2.59626,0.74017 2.42992,0.8568 -2.19036,1.53577 -6.41616,0.94289 -15.97983,1.09682 -16.80615,0.27051 z M 521.5,652.5765 c -0.75476,-1.22122 5.15806,-1.22122 8,0 1.50956,0.64868 0.84968,0.87666 -2.69098,0.92971 -2.58004,0.0387 -4.9691,-0.37971 -5.30902,-0.92971 z m -23.25,-2.78677 c -2.85169,-0.29828 -3.25,-0.69985 -3.25,-3.27659 0,-2.59627 0.34772,-2.93664 3,-2.93664 2.26812,0 3,-0.45805 3,-1.87756 0,-1.03265 0.58097,-2.35971 1.29104,-2.94902 0.98427,-0.81687 1.32792,-0.54895 1.44629,1.12756 0.0854,1.20946 0.42026,3.63721 0.74415,5.39501 0.69313,3.76177 -1.09079,5.05495 -6.23148,4.51724 z M 353,644.5765 c 0,-0.55 0.64844,-1 1.44098,-1 0.79254,0 1.7191,0.45 2.05902,1 0.33992,0.55 -0.30852,1 -1.44098,1 -1.13246,0 -2.05902,-0.45 -2.05902,-1 z m 132,-10.93785 c 0,-5.26793 0.21971,-5.9213 1.94739,-5.79116 4.04099,0.3044 3.37091,11.72901 -0.68794,11.72901 -0.8712,0 -1.25945,-1.83047 -1.25945,-5.93785 z m 5.5,4.93785 c -0.38401,-0.62134 1.50929,-1 5,-1 3.49071,0 5.38401,0.37866 5,1 -0.33992,0.55 -2.58992,1 -5,1 -2.41008,0 -4.66008,-0.45 -5,-1 z M 333.02764,591.1098 c -1.03796,-1.25066 -1.01954,-1.54626 0.0999,-1.60359 0.75486,-0.0386 0.47246,-0.45702 -0.62754,-0.92971 -1.69938,-0.73025 -1.53202,-0.86999 1.11346,-0.92971 2.58153,-0.0583 3.09408,0.29998 3,2.09688 -0.14194,2.71122 -1.91035,3.38495 -3.58582,1.36613 z M 360,571.28073 c 0,-3.38424 0.99876,-5.82303 2.10478,-5.13947 1.42914,0.88325 1.03528,5.07411 -0.60478,6.43524 -1.26639,1.05101 -1.5,0.84921 -1.5,-1.29577 z M 220.20821,536.28865 c -5.6344,-5.74104 -5.44751,-6.71215 1.29179,-6.71215 l 5.5,0 0,5.5 c 0,6.80166 -1.11142,7.00002 -6.79179,1.21215 z m -37.39542,-27.77379 c -0.6088,-1.82639 0.35618,-8.93836 1.21279,-8.93836 1.41968,0 2.15381,5.79629 1.00581,7.94135 -1.24224,2.32114 -1.70753,2.53023 -2.2186,0.99701 z m 25.82007,-7.05213 c -1.25887,-1.7973 -2.16568,-2.02987 -6.0567,-1.55334 -4.05963,0.49718 -4.57616,0.34072 -4.57616,-1.38622 0,-1.29003 -0.68522,-1.94667 -2.03138,-1.94667 -2.25736,0 -3.49851,-2.17674 -2.59045,-4.54312 0.46905,-1.22232 1.01686,-1.31583 2.635,-0.44983 1.12357,0.60131 1.73488,1.5916 1.35847,2.20065 -0.45313,0.73318 0.0439,0.91689 1.47099,0.5437 1.18546,-0.31 2.40738,-0.15589 2.71539,0.34248 0.75133,1.21567 6.44198,1.16382 6.44198,-0.0587 0,-1.56041 3.49875,-2.97902 5.83833,-2.36721 1.87786,0.49107 2.16167,1.27209 2.16167,5.94866 0,5.29181 -0.0501,5.38337 -2.9433,5.38337 -1.86248,0 -3.48696,-0.7762 -4.42384,-2.11377 z m -14.03263,-48.13738 c 0.0929,-8.57501 0.25237,-9.27154 2.18852,-9.56034 2.32516,-0.34683 2.92762,-2.11155 2.36873,-6.93851 -0.27648,-2.38795 -0.87776,-3.25 -2.26689,-3.25 -1.43399,0 -1.89059,0.72454 -1.89059,3 0,3.24252 -0.0571,3.29905 -2.41821,2.39301 -2.40406,-0.92252 -2.05739,-5.39301 0.41821,-5.39301 1.33333,0 2,-0.66667 2,-2 0,-1.33333 0.66667,-2 2,-2 1.39394,0 2,0.66667 2,2.2 0,3.86368 1.8966,0.55956 2.20804,-3.84669 0.28785,-4.07246 0.34124,-4.12587 3.79196,-3.79329 6.30453,0.60763 11.0085,1.64471 11.56829,2.55047 0.30236,0.48923 -0.82681,0.88951 -2.50927,0.88951 -2.39235,0 -3.05902,0.43587 -3.05902,2 0,1.31306 0.66667,2 1.94098,2 1.06754,0 2.2191,0.45 2.55902,1 0.39224,0.63465 -2.28785,1 -7.33567,1 l -7.95371,0 0.81938,3.633 c 0.46273,2.05172 0.4169,4.69157 -0.10532,6.0651 -0.50857,1.33765 -0.92468,4.00436 -0.92468,5.92602 0,1.92165 -0.35899,3.27205 -0.79775,3.00088 -0.43876,-0.27117 -1.45126,-0.0796 -2.25,0.42567 -1.13385,0.71729 -0.95896,0.92206 0.79775,0.93402 1.92146,0.0131 2.25,0.55071 2.25,3.68198 0,2.01666 -0.27857,3.38809 -0.61905,3.04762 -0.34047,-0.34048 -1.27262,0.0345 -2.07143,0.83333 -0.79881,0.79881 -1.75773,1.45186 -2.13095,1.45123 -0.37321,-6.4e-4 -0.63347,-4.16314 -0.57834,-9.25 z m 21.28679,-72.24885 c -1.31414,-2.15255 -1.89917,-6.5 -0.87469,-6.5 0.57774,0 1.2969,0.64227 1.59814,1.42727 0.71481,1.86278 0.0714,6.37461 -0.72345,5.07273 z m 240,-88 c -1.31414,-2.15255 -1.89917,-6.5 -0.87469,-6.5 0.57774,0 1.2969,0.64227 1.59814,1.42727 0.71481,1.86278 0.0714,6.37461 -0.72345,5.07273 z m 34.59285,-16.53257 c -0.35099,-0.56791 -1.02114,-2.36791 -1.48921,-4 -1.13926,-3.97238 0.81412,-3.9449 2.31544,0.0326 1.06128,2.81164 1.46393,3 6.41314,3 4.61409,0 5.28076,-0.25249 5.28076,-2 0,-1.67151 -0.66667,-2 -4.05902,-2 -2.45136,0 -3.81423,-0.39607 -3.44098,-1 0.33992,-0.55 2.34746,-1 4.46119,-1 3.41158,0 3.96644,0.35365 4.94098,3.14922 0.60381,1.73208 1.09783,3.53208 1.09783,4 0,1.225 -14.75752,1.05214 -15.52013,-0.18179 z m 2.704,-12.18356 c -0.82766,-0.82766 -0.83789,-1.49583 -0.0376,-2.46008 1.58086,-1.90482 2.85376,-1.62953 2.85376,0.61719 0,2.44846 -1.33617,3.32285 -2.81613,1.84289 z m -4.53052,-2.00145 c -0.76717,-2.93368 -0.0757,-3.44005 1.26833,-0.92875 0.60986,1.13953 0.695,2.2652 0.19471,2.57439 -0.48895,0.3022 -1.14732,-0.43834 -1.46304,-1.64564 z M 612,253.84517 c -5.22275,-0.61369 -6.17619,-2.26867 -1.30699,-2.26867 2.71574,0 4.2867,0.50474 4.66862,1.5 0.31658,0.825 0.47722,1.42798 0.35699,1.33996 -0.12024,-0.088 -1.79362,-0.3451 -3.71862,-0.57129 z m -9.52232,-3.19834 c 0.38259,-1.20545 0.1771,-2.78136 -0.46329,-3.55299 -1.63616,-1.97146 -0.89291,-8.01734 0.98561,-8.01734 2.05422,0 2.19183,12.60272 0.14506,13.28498 -0.9868,0.32893 -1.16813,-0.13695 -0.66738,-1.71465 z M 606.5,239.5765 c -0.37973,-0.61442 1.23621,-0.9941 4.19098,-0.98469 3.4736,0.0111 4.39248,0.2845 3.30902,0.98469 -1.96772,1.27164 -6.71409,1.27164 -7.5,0 z m -66.8125,-1.64583 c -1.3041,-1.3041 -0.68149,-2.35417 1.39583,-2.35417 1.16375,0 1.90861,0.52417 1.6875,1.1875 -0.48711,1.46134 -2.15686,2.09314 -3.08333,1.16667 z m -33.78882,-8.10417 c -0.0557,-0.4125 -0.0362,-2.1 0.0433,-3.75 0.0795,-1.65 -0.29628,-6.07522 -0.83513,-9.83382 -1.10937,-7.73807 -0.7104,-9.66618 2.00016,-9.66618 1.5769,0 1.89301,0.75144 1.89301,4.5 0,2.6606 0.45881,4.5 1.12244,4.5 0.75652,0 0.70054,0.50837 -0.17171,1.55937 -0.81085,0.97701 -1.20362,3.77796 -1.05171,7.5 0.19736,4.8357 -0.0497,5.94063 -1.32828,5.94063 -0.86391,0 -1.61633,-0.3375 -1.67206,-0.75 z M 618,222.65829 c 0,-0.50502 -0.2751,-1.63512 -0.61134,-2.51134 -0.44745,-1.16604 -0.17937,-1.42737 1,-0.9748 1.73981,0.66763 2.25848,4.40435 0.61134,4.40435 -0.55,0 -1,-0.4132 -1,-0.91821 z M 603.19521,210.8265 c 0.21945,-3.42009 0.72476,-4.75 1.80479,-4.75 1.08003,0 1.58534,1.32991 1.80479,4.75 0.27347,4.2619 0.088,4.75 -1.80479,4.75 -1.89281,0 -2.07826,-0.4881 -1.80479,-4.75 z m 13.04534,2.76357 c -2.74086,-4.38882 -1.0916,-7.01357 4.40698,-7.01357 1.36617,0 3.40644,-0.4937 4.53391,-1.09711 1.61801,-0.86593 1.95662,-0.81325 1.60696,0.25 -0.24365,0.74091 -2.09571,1.48677 -4.1157,1.65748 -3.55625,0.30052 -3.6727,0.43527 -3.6727,4.25 0,4.35179 -0.8748,4.971 -2.75945,1.9532 z m 32.36644,0.40464 C 648.27314,213.12473 648,211.06223 648,209.41138 c 0,-4.63514 2.44703,-2.89817 2.8075,1.99284 0.30324,4.11454 -1.01856,5.6706 -2.20051,2.59049 z M 627,200.2765 c 0,-0.715 0.42839,-1.72839 0.95197,-2.25197 0.52358,-0.52358 1.06657,-2.65367 1.20665,-4.73353 0.18873,-2.8024 0.65429,-3.69822 1.79802,-3.45971 0.84885,0.17701 1.48167,1.08725 1.40626,2.02276 -0.0765,0.94956 0.32436,1.41574 0.90753,1.05532 0.67535,-0.41739 0.81701,0.20503 0.40075,1.76076 -0.35413,1.3235 -0.65002,2.96887 -0.65753,3.65637 -0.008,0.6875 -0.91365,1.25 -2.01365,1.25 -1.1,0 -2,0.45 -2,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.585 -1,-1.3 z m 16.75,-11.2767 c -0.4125,-0.41615 -0.75,-3.92163 -0.75,-7.78997 0,-4.90846 0.31696,-6.71637 1.04913,-5.9842 0.59012,0.59012 0.91826,3.9983 0.75,7.78996 -0.16452,3.70746 -0.63663,6.40035 -1.04913,5.98421 z M 617,185.0765 c 0,-2.47119 1.35495,-3.35273 2.44423,-1.59024 0.72276,1.16945 -0.38495,4.09024 -1.55122,4.09024 -0.49115,0 -0.89301,-1.125 -0.89301,-2.5 z m 15.38836,-9.89144 c 0.57587,-1.65682 0.4542,-1.72279 -0.98081,-0.53184 -1.43011,1.18689 -1.59058,1.11221 -1.26317,-0.58789 0.54249,-2.81695 5.09589,-4.16542 8.56533,-2.53659 1.61431,0.75789 2.26085,1.50145 1.53406,1.76428 -0.69093,0.24987 -0.99976,0.86928 -0.68629,1.37648 0.31346,0.5072 -0.63303,0.37407 -2.10332,-0.29584 -2.32387,-1.05883 -2.87256,-0.96179 -4.19824,0.74241 -1.43658,1.84678 -1.48687,1.85078 -0.86756,0.069 z M 598.5,174.84482 c -2.7755,-0.69344 -3.0785,-1.46252 -2.65819,-6.74716 0.28973,-3.643 0.71799,-4.56117 2.01311,-4.31609 1.06919,0.20233 1.7612,1.53228 1.97678,3.7991 0.18244,1.91829 0.80004,4.05211 1.37245,4.74182 0.73449,0.885 0.69308,1.25401 -0.14072,1.25401 -0.64981,0 -0.90335,0.45 -0.56343,1 0.33992,0.55 0.47898,0.9478 0.30902,0.884 C 600.63906,175.3967 599.6,175.11964 598.5,174.84482 z M 576,703.5765 c 0,-1.4392 -0.66667,-2 -2.37756,-2 -2.85134,0 -5.43333,2.51364 -3.41418,3.32381 3.15383,1.26544 5.79174,0.6625 5.79174,-1.32381 z m 2,-14 c 0,-1.61905 -0.66667,-2 -3.5,-2 -2.83333,0 -3.5,0.38095 -3.5,2 0,1.61905 0.66667,2 3.5,2 2.83333,0 3.5,-0.38095 3.5,-2 z M 499.72976,671.26579 C 499.06001,669.25652 497,669.40442 497,671.46178 c 0,1.43811 0.46137,1.87491 1.54226,1.46013 0.84825,-0.3255 1.38262,-1.07076 1.1875,-1.65612 z m -35.01177,-20.05396 c -0.48567,-1.48133 -5.67447,-2.07885 -6.95268,-0.80064 -1.71815,1.71815 -0.0212,2.79358 3.71909,2.35692 2.09882,-0.24502 3.45025,-0.89545 3.23359,-1.55628 z M 223,642.0765 c 0,-0.825 -0.675,-1.5 -1.5,-1.5 -0.825,0 -1.5,0.675 -1.5,1.5 0,0.825 0.675,1.5 1.5,1.5 0.825,0 1.5,-0.675 1.5,-1.5 z m 328,-0.37756 c 0,-1.03265 0.675,-2.43775 1.5,-3.12244 1.65361,-1.37238 2.09871,-4.48806 0.5,-3.5 -0.55,0.33992 -1,0.14148 -1,-0.44098 0,-0.58246 -1.79496,-1.05902 -3.9888,-1.05902 -3.63289,0 -3.97051,0.22092 -3.78388,2.47594 0.1127,1.36177 0.78266,2.69765 1.4888,2.96862 0.70613,0.27097 1.28388,1.40679 1.28388,2.52406 0,1.36471 0.65637,2.03138 2,2.03138 1.28986,0 2,-0.66667 2,-1.87756 z m -2.69718,-13.60874 c 0.10845,-0.54247 -0.59032,-1.13797 -1.55282,-1.32333 -1.0946,-0.2108 -1.75,0.27967 -1.75,1.30963 0,1.73979 2.9553,1.75204 3.30282,0.0137 z M 592,623.5765 c 0,-1.42857 -0.66667,-2 -2.33333,-2 -1.28334,0 -2.60233,0.26899 -2.9311,0.59777 -1.24515,1.24514 0.57539,3.40223 2.87142,3.40223 1.72634,0 2.39301,-0.55718 2.39301,-2 z m -89,-14 c 0,-1.33333 -0.66667,-2 -2,-2 -1.33333,0 -2,0.66667 -2,2 0,1.33333 0.66667,2 2,2 1.33333,0 2,-0.66667 2,-2 z m -69,-26.69113 c 0,-3.46021 0.0919,-3.56969 1.4682,-1.75 0.8075,1.06762 1.4825,1.40843 1.5,0.75735 0.0197,-0.73431 1.04933,-0.99927 2.71173,-0.69781 3.66376,0.66436 4.32007,1.18706 4.32007,3.44061 0,1.68604 0.72241,1.94098 5.5,1.94098 4.22222,0 5.5,-0.34848 5.5,-1.5 0,-1.13112 -1.21613,-1.5 -4.94521,-1.5 l -4.94521,0 -0.30479,-4.72888 c -0.2944,-4.56773 -0.41817,-4.73793 -3.63157,-4.99409 -1.82974,-0.14587 -4.19224,0.19796 -5.25,0.76406 -1.05777,0.5661 -1.92322,0.82525 -1.92322,0.57588 0,-0.24937 -0.24967,-1.10402 -0.55481,-1.89922 -0.38535,-1.0042 0.37827,-1.63244 2.5,-2.05679 1.81802,-0.3636 3.05481,-1.23387 3.05481,-2.14953 0,-0.84621 0.5625,-2.44619 1.25,-3.55551 1.61464,-2.60532 -0.21896,-3.91904 -5.5,-3.94061 -2.0625,-0.008 -3.75,-0.46531 -3.75,-1.01531 0,-0.55 -0.87344,-1 -1.94098,-1 -1.06754,0 -2.2191,-0.45 -2.55902,-1 -0.3687,-0.59656 0.84739,-1 3.01431,-1 2.91913,0 3.56718,-0.34361 3.30046,-1.75 -0.44831,-2.36399 -5.11582,-2.80609 -7.23648,-0.68544 -1.51273,1.51274 -1.52478,1.83708 -0.12572,3.38304 1.01367,1.12008 1.54743,3.6661 1.54743,7.38114 0,5.38268 0.12721,5.67126 2.5,5.67126 2.44444,0 2.5,0.16667 2.5,7.5 0,4.33333 0.42222,7.5 1,7.5 0.55,0 1,-1.66101 1,-3.69113 z m 117,-17.30887 0,-6 -6,0 c -4.66667,0 -6,0.33333 -6,1.5 0,0.825 -0.87344,1.5 -1.94098,1.5 -1.06754,0 -2.20962,0.43466 -2.53796,0.96592 -0.37486,0.60653 1.83557,0.73876 5.94099,0.35539 L 547,563.28729 l 0,4.14461 c 0,3.47793 0.3217,4.1446 2,4.1446 1.77778,0 2,-0.66667 2,-6 z m -256,3.5 c 0,-0.83333 -0.88889,-1.5 -2,-1.5 -1.11111,0 -2,0.66667 -2,1.5 0,0.83333 0.88889,1.5 2,1.5 1.11111,0 2,-0.66667 2,-1.5 z m 90.5,-12.5 c 0.33992,-0.55 1.49148,-1 2.55902,-1 1.27431,0 1.94098,-0.68694 1.94098,-2 0,-1.1 -0.47149,-2 -1.04775,-2 -0.9346,0 -5.95225,4.7595 -5.95225,5.64602 0,0.78465 1.92289,0.28776 2.5,-0.64602 z m -50.5,-11.5 c 0,-1.7971 -0.53889,-2.5 -1.91667,-2.5 -1.05416,0 -2.11287,0.5625 -2.35269,1.25 -0.71633,2.05359 0.35867,3.75 2.37635,3.75 1.35254,0 1.89301,-0.71376 1.89301,-2.5 z M 734.89365,264.01619 c 0.56276,-0.56277 1.03138,-3.13298 1.76669,-9.68969 0.5205,-4.64136 0.61125,-4.75 3.96756,-4.75 3.67637,0 5.52337,-2.24873 3.50488,-4.26722 C 743.50975,244.68625 743,241.3415 743,237.8765 c 0,-6.27246 -0.0126,-6.3 -2.875,-6.3 -2.39444,0 -2.97529,-0.50145 -3.475,-3 -0.56059,-2.80295 -0.89722,-3 -5.125,-3 -4.40054,0 -4.525,-0.0859 -4.525,-3.12244 0,-2.53404 0.25878,-2.90768 1.37325,-1.98275 3.28815,2.72892 6.28669,-2.72573 3.72324,-6.77293 C 730.96428,211.91084 729,213.13967 729,215.63552 c 0,1.06754 -0.47147,1.94098 -1.04772,1.94098 -0.65029,0 -0.93478,-2.37079 -0.75,-6.25 0.25088,-5.26676 0.56856,-6.2048 2.0193,-5.96269 1.18591,0.19791 1.90139,-0.57997 2.29943,-2.5 0.31782,-1.53302 1.08209,-4.48832 1.69839,-6.56734 1.49934,-5.05789 0.30523,-6.17569 -5.64422,-5.28352 -4.21242,0.6317 -4.57518,0.91383 -4.57518,3.5584 0,2.39005 -0.46172,2.92543 -2.75,3.18873 -2.51837,0.28977 -2.77567,0.71651 -3.05479,5.06642 -0.16764,2.6125 -0.73014,4.75 -1.25,4.75 -0.51987,0 -0.94521,2.7 -0.94521,6 l 0,6 4,0 4,0 0,8 0,8 4,0 c 4,0 4,0 4,4 0,3.77778 0.16667,4 3,4 2.66667,0 3,0.33333 3,3 0,2.93333 -0.11111,3 -5,3 -2.75,0 -5,-0.45 -5,-1 0,-0.55 -1.09844,-1 -2.44098,-1 -1.34254,0 -2.7191,-0.45 -3.05902,-1 -0.33992,-0.55 -1.49148,-1 -2.55902,-1 -1.54551,0 -1.94098,-0.70157 -1.94098,-3.4433 0,-2.33022 -0.6583,-3.90438 -2.03645,-4.86968 -1.37324,-0.96185 -2.40774,-3.42287 -3.17651,-7.5567 -0.62703,-3.37168 -1.51062,-6.13032 -1.96355,-6.13032 -0.45292,0 -0.82349,0.69083 -0.82349,1.53518 0,0.84435 -0.70168,2.60608 -1.55928,3.91495 -1.20684,1.84188 -1.40367,3.75513 -0.87083,8.46481 0.62151,5.49345 0.91321,6.08506 3.00026,6.08506 1.2715,0 2.58993,0.45 2.92985,1 0.33992,0.55 1.46431,1 2.49865,1 1.45132,0 1.95147,0.85604 2.19098,3.75 0.24931,3.01222 0.75304,3.81287 2.56037,4.06955 1.82523,0.25923 2.25,0.95603 2.25,3.69098 0,1.85429 -0.45,3.64955 -1,3.98947 -0.55,0.33992 -1,1.5373 -1,2.66085 0,1.92749 0.40687,2.00659 7.20661,1.40104 3.96363,-0.35297 7.4228,-0.85797 7.68704,-1.1222 z M 653,261.01748 c 0,-0.79254 -0.45,-1.44098 -1,-1.44098 -0.55,0 -1,0.92656 -1,2.05902 0,1.13246 0.45,1.7809 1,1.44098 0.55,-0.33992 1,-1.26648 1,-2.05902 z m 59.81638,-2.79837 c 0.24896,-2.07877 -0.24441,-2.85485 -2.31548,-3.64227 -1.77696,-0.6756 -3.26023,-0.66433 -4.56637,0.0347 -2.24567,1.20185 -2.56853,2.96496 -0.54294,2.96496 0.76538,0 1.66989,1.10883 2.01003,2.46406 0.51676,2.05892 0.98675,2.32892 2.85841,1.64213 1.39755,-0.51282 2.35895,-1.81541 2.55635,-3.46358 z M 663,259.5765 c 0,-0.55 -1.4625,-0.95514 -3.25,-0.90032 -3.07927,0.0944 -3.11867,0.14174 -0.75,0.90032 3.5288,1.13012 4,1.13012 4,0 z m 88,-14.5 c 0,-4.22222 -0.34848,-5.5 -1.5,-5.5 -0.91228,0 -1.5,0.93056 -1.5,2.375 0,1.30625 -0.28125,3.78125 -0.625,5.5 -0.54314,2.71569 -0.34667,3.125 1.5,3.125 1.90909,0 2.125,-0.55882 2.125,-5.5 z M 169,229.51748 c 0,-3.29399 -0.44555,-5.94098 -1,-5.94098 -0.56503,0 -1,2.85301 -1,6.55902 0,4.11803 0.37216,6.32901 1,5.94098 0.55,-0.33992 1,-3.29148 1,-6.55902 z m 536,4.05902 c 0,-1.1 -0.45,-2 -1,-2 -0.55,0 -1,-1.8 -1,-4 0,-3.33333 -0.33333,-4 -2,-4 -1.66667,0 -2,0.66667 -2,4 0,2.2 -0.45,4 -1,4 -1.43935,0 -1.23421,2.73883 0.25,3.33772 0.6875,0.27741 2.4875,0.53991 4,0.58333 2.10965,0.0606 2.75,-0.38676 2.75,-1.92105 z m 58.08839,-40.25 c -0.55214,-2.72295 -1.1586,-3.2992 -3.73972,-3.55337 -2.66352,-0.26228 -3.06501,0.009 -2.96469,2 0.0787,1.56194 0.73343,2.30474 2.0341,2.30761 1.05494,0.002 2.10494,0.56483 2.33333,1.25 0.22839,0.68517 0.99592,1.24576 1.70562,1.24576 0.92432,0 1.10342,-0.92197 0.63136,-3.25 z m 2.32982,-5.35699 c 2.2694,-0.87085 2.02756,-4.39301 -0.30163,-4.39301 -1.21488,0 -2.05306,0.88741 -2.36133,2.5 -0.49503,2.58958 -0.0243,2.92421 2.66296,1.89301 z M 712.75047,175.3265 c -0.22891,-0.6875 -1.16483,-1.39519 -2.07983,-1.57265 -1.16012,-0.225 -1.48098,0.15332 -1.06014,1.25 0.70939,1.84865 3.75217,2.16131 3.13997,0.32265 z M 1057.393,-39.005291 c 1.0587,-2.758981 0.6972,-3.737967 -0.893,-2.418213 -1.637,1.358564 -2.0378,4 -0.607,4 0.4912,0 1.1662,-0.711804 1.5,-1.581787 z M -71,594.5765 c 0,-1.65 0.17393,-3 0.3865,-3 0.21258,0 0.58464,1.35 0.82681,3 0.24217,1.65 0.0682,3 -0.3865,3 -0.45475,0 -0.82681,-1.35 -0.82681,-3 z m -2,-1.43045 c 0,-0.78675 -1.0125,-1.62546 -2.25,-1.86382 -1.92915,-0.37157 -1.85784,-0.45279 0.5,-0.56955 2.12873,-0.10541 2.75,0.31565 2.75,1.86382 0,1.1 -0.225,2 -0.5,2 -0.275,0 -0.5,-0.6437 -0.5,-1.43045 z"
+         id="path3127"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#6d594c"
+         d="m -30.57637,964.9149 c 0.35068,-0.9138 2.64882,-4.6868 5.10698,-8.3845 2.45817,-3.6976 4.46939,-7.03127 4.46939,-7.40821 0,-0.37694 1.37279,-2.68061 3.05063,-5.11928 4.52972,-6.58372 5.32114,-13.04566 4.0741,-33.26497 -1.06418,-17.25453 -2.21899,-22.37801 -6.00629,-26.64779 -0.98236,-1.10751 -2.97507,-4.10032 -4.42823,-6.65069 -1.45316,-2.55037 -4.22794,-5.57269 -6.16616,-6.71627 C -32.95903,869.25814 -34,867.93159 -34,866.23235 c 0,-1.32638 -0.72357,-4.14334 -1.60792,-6.2599 -2.12021,-5.07438 -3.70955,-14.29362 -3.9016,-22.63193 -0.10858,-4.71461 -0.65558,-7.28898 -1.82281,-8.57875 -2.66522,-2.94504 -2.27018,-11.70896 0.65284,-14.48302 2.38098,-2.25964 3.43689,-9.11612 1.58057,-10.26338 C -39.59451,803.70907 -40,802.41512 -40,801.13993 c 0,-1.2752 -0.675,-2.87874 -1.5,-3.56343 -2.08914,-1.73383 -2.08017,-13.70144 0.012,-16.01327 0.8316,-0.91891 1.65618,-3.42934 1.83239,-5.57874 0.23811,-2.90432 0.81159,-4.00314 2.23296,-4.27849 3.4841,-0.67493 10.12731,-5.98737 11.74181,-9.38967 0.8744,-1.84266 2.91727,-5.02068 4.53971,-7.06225 3.75845,-4.72939 5.01319,-10.3052 5.58853,-24.8342 0.49227,-12.43141 0.002,-16.70753 -3.36091,-29.33566 -1.88355,-7.07218 -2.74719,-8.62634 -7.50188,-13.5 -2.95531,-3.02924 -6.08012,-6.91749 -6.94404,-8.64055 -0.90649,-1.80797 -2.64276,-3.40189 -4.10567,-3.76905 C -38.85929,674.8247 -40,673.87197 -40,673.05745 c 0,-0.81452 -0.45532,-1.48095 -1.01182,-1.48095 -0.61079,0 -0.77196,-1.49999 -0.40663,-3.7846 0.62476,-3.90704 -1.60023,-9.09353 -5.88389,-13.7154 -3.31108,-3.57251 -4.68824,-8.0647 -3.46548,-11.30415 0.86626,-2.295 0.777,-3.34466 -0.43112,-5.06949 -1.15294,-1.64605 -1.32465,-3.20317 -0.70587,-6.40079 0.44974,-2.32406 0.83731,-5.91307 0.86126,-7.97557 0.0352,-3.03037 0.41603,-3.75 1.98453,-3.75 1.06754,0 2.2191,0.45 2.55902,1 0.9647,1.56091 4.21928,1.17394 4.89301,-0.58179 0.91963,-2.39652 0.73978,-3.85435 -0.72218,-5.85369 -1.10146,-1.50634 -1.70105,-1.61871 -3.5,-0.65595 -1.81478,0.97124 -2.17083,0.89465 -2.17083,-0.46701 0,-0.89584 0.83542,-1.84727 1.8565,-2.11428 1.063,-0.27799 2.33536,-2.04577 2.97687,-4.13601 1.00255,-3.26661 0.85989,-4.02639 -1.3565,-7.22464 -2.54137,-3.6672 -3.39336,-10.28217 -1.47687,-11.46663 0.55,-0.33992 1,-1.63162 1,-2.87046 0,-2.81013 3.44623,-6.62954 5.98179,-6.62954 3.48006,0 8.71642,-3.97972 13.0297,-9.90277 6.8499,-9.40637 7.30194,-11.30107 7.53867,-31.59723 0.30632,-26.26376 -0.20788,-27.63526 -18.52413,-49.40841 C -38.08829,486.34347 -39,484.81095 -39,484.26248 c 0,-0.54846 -1.125,-2.47215 -2.5,-4.27487 -1.375,-1.80272 -2.5,-4.16511 -2.5,-5.24977 0,-1.08466 -1.53318,-3.80721 -3.40707,-6.05011 -2.93917,-3.51796 -3.33547,-4.61181 -2.88572,-7.96497 0.31212,-2.32702 0.0742,-4.16335 -0.59293,-4.57563 -1.74611,-1.07916 -1.30924,-6.135 0.89565,-10.36517 1.90308,-3.65115 2.10765,-5.44464 1.84841,-16.20546 -0.13578,-5.63656 1.01825,-10.17247 2.94988,-11.59441 0.98924,-0.72822 1.27329,-1.94469 0.84891,-3.63558 -0.42638,-1.69883 -0.12569,-2.96618 0.90713,-3.82334 2.89686,-2.40418 3.81256,-5.44279 4.43915,-14.73059 l 0.62633,-9.28392 5.46322,-5.71608 c 3.00477,-3.14384 6.38163,-7.06608 7.50413,-8.71608 3.26358,-4.79725 5.19522,-17.29468 4.9016,-31.71257 -0.44573,-21.88703 -0.52552,-22.1756 -9.10015,-32.91104 -5.94186,-7.43919 -7.92102,-10.79698 -9.57949,-16.25233 -1.1497,-3.78176 -2.92931,-7.59427 -3.9547,-8.47224 C -44.16104,281.85035 -45,280.70496 -45,280.183 c 0,-0.52196 -0.63917,-1.65945 -1.42038,-2.52776 -0.91954,-1.02206 -1.63741,-5.10483 -2.03589,-11.57874 -0.33853,-5.5 -1.08004,-11.44972 -1.6478,-13.2216 -0.80082,-2.49922 -0.69231,-3.84459 0.48392,-6 3.27571,-6.00264 3.78179,-8.10532 4.10894,-17.07223 0.18649,-5.11161 0.78278,-9.83661 1.32508,-10.5 0.54231,-0.6634 1.58336,-3.79367 2.31345,-6.95617 0.7301,-3.1625 1.67513,-5.75 2.10007,-5.75 0.42493,0 0.77261,-2.03945 0.77261,-4.53212 0,-5.71671 1.85858,-10.19262 6.27322,-15.10744 8.45072,-9.4082 11.48203,-22.20733 10.38778,-43.86044 -0.8672,-17.1604 -2.75026,-22.59933 -10.7986,-31.19014 -2.67432,-2.85458 -4.8624,-5.67602 -4.8624,-6.26987 0,-0.59385 -1.05378,-2.75829 -2.34174,-4.80986 -1.28796,-2.051574 -2.6524,-5.699684 -3.03209,-8.106904 -0.37969,-2.40722 -1.35277,-5.32251 -2.1624,-6.47842 -1.60505,-2.29153 -1.07604,-11.03607 0.81179,-13.41898 1.11292,-1.40478 1.08715,-1.44902 -1.77556,-3.04794 -1.1,-0.61439 -1.4375,-1.13076 -0.75,-1.14748 1.49298,-0.0363 1.70814,-3.03041 0.21778,-3.03041 -0.56773,0 -1.42405,-1.0125 -1.90294,-2.25 -0.93261,-2.40993 0.62622,-5.92173 3.90959,-8.80771 2.344,-2.0603 2.93389,-7.680175 3.09037,-29.44229 0.14354,-19.962742 1.14214,-24.760206 6.81074,-32.720045 7.85785,-11.033986 9.41849,-15.361584 10.55911,-29.279955 l 1.06535,-13 540.82051,-0.250919 c 485.67789,-0.225334 540.97739,-0.09402 542.35929,1.287903 1.0426,1.042543 1.3228,2.413489 0.8689,4.250919 -1.8048,7.306762 -1.8199,8.540603 -0.1195,9.783968 0.9372,0.685298 1.7865,1.624476 1.8874,2.087063 0.1009,0.462586 0.5209,0.728566 0.9334,0.591066 0.4125,-0.1375 0.75,0.17011 0.75,0.683578 0,0.513467 1.2375,1.075967 2.75,1.25 2.3492,0.270299 2.7646,0.792582 2.85,3.583089 0.055,1.796666 0.3896,3.556265 0.7436,3.910219 0.9567,0.956775 8.7149,-1.598145 9.0577,-2.982867 0.1625,-0.65671 0.8523,-2.769019 1.5329,-4.694019 2.4815,-7.019013 2.4822,-7 -0.2563,-7 -2.2534,0 -2.6333,-0.520014 -3.2154,-4.401238 -0.363,-2.420681 -0.3602,-5.345681 0.01,-6.5 l 0.6623,-2.098762 56.4326,0 56.4326,0 0,508.500004 0,508.5 -611.10699,0 c -569.20553,0 -611.06327,-0.1139 -610.46938,-1.6616 z M 1080.5,905.28045 c 3.9068,-2.21043 4.0046,-2.40018 4.1991,-8.14437 0.1095,-3.23466 -0.2438,-6.70884 -0.7852,-7.72039 -1.0352,-1.93431 -3.9139,-2.55154 -3.9139,-0.83919 0,0.55 -0.6592,1 -1.4648,1 -0.8057,0 -1.9465,0.9 -2.5352,2 -0.9411,1.75853 -0.7605,2 1.4962,2 4.1607,0 4.5963,5.46917 0.5432,6.82021 -0.7834,0.26112 -1.0346,-0.0189 -0.6196,-0.69048 0.384,-0.62135 0.2638,-1.12973 -0.2672,-1.12973 -0.5309,0 -0.73,-0.9 -0.4423,-2 0.2924,-1.11819 0.031,-2 -0.5937,-2 -0.9686,0 -1.6721,3.75849 -1.1933,6.37516 0.088,0.48134 -0.4652,1.60634 -1.2295,2.5 -0.7643,0.89366 -1.7096,2.18734 -2.1007,2.87484 -1.2021,2.11297 4.509,1.44225 8.9069,-1.04605 z M 346.98469,776.38552 c 0.008,0.71996 0.42781,1.05407 0.93198,0.74248 0.50416,-0.31159 0.91666,-2.56417 0.91666,-5.00573 0,-5.16995 -1.9084,-7.55828 -4.39228,-5.49685 -1.17924,0.97869 -1.39471,2.2872 -0.88464,5.37245 0.84248,5.09593 1.45764,6.16454 2.55328,4.43539 0.68482,-1.08079 0.8628,-1.0905 0.875,-0.0477 z M 441,772.0765 c 0,-4.33333 -0.11111,-4.5 -3,-4.5 -2.64167,0 -3,0.34538 -3,2.89159 0,2.25038 0.55438,3.03073 2.5,3.51905 1.375,0.34511 2.5,1.06889 2.5,1.60841 0,0.53952 0.225,0.98095 0.5,0.98095 0.275,0 0.5,-2.025 0.5,-4.5 z m -48.07085,-1.05013 c 3.6222,-5.36707 3.7161,-6.03418 1.05018,-7.46093 -2.71317,-1.45205 -3.97933,-0.4752 -3.97933,3.07008 0,1.61754 -0.45,2.94098 -1,2.94098 -1.11229,0 -1.38019,4.28648 -0.33333,5.33333 0.98914,0.98915 0.94981,1.02499 4.26248,-3.88346 z m -7.10583,-9.78274 c 0.21801,-1.12408 -0.35203,-1.66713 -1.75,-1.66713 -1.14032,0 -2.07332,0.6 -2.07332,1.33333 0,3.06275 3.23923,3.34555 3.82332,0.3338 z M 215.57294,733.81119 c 0.59012,-0.40408 1.36774,-1.53324 1.72804,-2.50925 0.73557,-1.99255 2.00183,-1.85246 12.47335,1.37993 5.84989,1.80576 6.67053,1.83411 12.13131,0.41908 4.61488,-1.19584 6.99554,-1.29516 11.22567,-0.46836 6.31877,1.23503 31.72441,0.30854 33.57135,-1.22428 0.67837,-0.563 1.13529,-1.5144 1.01537,-2.11423 -0.33944,-1.69792 8.27483,-0.80702 12.28197,1.27021 5.10825,2.64803 26.48555,4.15053 51.5,3.61966 11.55,-0.24513 21.675,-0.70443 22.5,-1.02068 0.825,-0.31625 6.9,-0.76275 13.5,-0.99221 8.86251,-0.30812 13.49685,-0.9633 17.72502,-2.50588 7.13294,-2.60234 8.36718,-2.59896 14.33131,0.0393 4.33663,1.9183 6.04861,2.0757 17.37712,1.59763 7.10685,-0.29992 14.4034,-0.0891 16.79442,0.4852 3.28397,0.78879 5.76097,0.63981 11.09487,-0.66733 5.8905,-1.44354 8.67698,-1.53821 19.59526,-0.6657 8.69699,0.695 13.57607,0.69149 15.40513,-0.0111 1.64957,-0.63362 6.41861,-0.76394 12.42687,-0.33958 9.54243,0.67399 11.12134,0.24425 8.55,-2.32709 -0.93333,-0.93333 -0.72963,-1.2 0.91667,-1.2 1.16416,0 2.30349,0.5625 2.53182,1.25 0.30152,0.90785 4.59566,1.33859 15.68788,1.57366 11.30521,0.23958 15.08848,0.0256 14.56353,-0.82383 -0.45457,-0.7355 0.0375,-0.68118 1.3705,0.1513 1.53213,0.95683 2.37388,1.00459 3.19708,0.18139 0.64056,-0.64056 2.76461,-0.89647 4.97731,-0.59969 2.12294,0.28475 4.61759,0.22697 5.54367,-0.1284 1.54477,-0.59279 1.55192,-0.79183 0.0866,-2.41099 -1.47271,-1.62733 -1.44992,-1.76487 0.29245,-1.76487 1.0393,0 1.80928,0.46607 1.71106,1.03572 -0.1709,0.9912 0.51664,1.07778 5.57143,0.70159 1.2375,-0.0921 4.01924,-1.74209 6.18165,-3.66666 4.55989,-4.05836 5.40551,-4.20175 8.84122,-1.49922 1.39842,1.1 3.03411,2 3.63486,2 0.60075,0 1.09227,0.4133 1.09227,0.91844 0,0.50514 1.59587,1.90474 3.54638,3.11023 2.95008,1.82324 4.67357,2.12808 10.25,1.81292 4.24095,-0.23968 8.18769,-1.15243 10.74339,-2.48459 2.22187,-1.15816 5.41032,-2.40676 7.08544,-2.77468 2.14842,-0.47188 3.52382,-1.67163 4.66873,-4.07253 1.67593,-3.51447 3.37853,-4.20864 11.70606,-4.77271 3.11393,-0.21093 3.53383,0.0552 3.80671,2.41227 0.25196,2.17646 0.96442,2.77273 3.99154,3.34062 2.98624,0.56023 3.87603,0.34475 4.69329,-1.13656 0.55465,-1.00532 2.64302,-3.5211 4.64081,-5.59063 3.31887,-3.43804 4.09561,-3.76148 9,-3.74772 6.04268,0.017 10.5943,1.38246 16.1771,4.85324 3.06238,1.90386 4.60415,2.24123 7.86176,1.72031 2.38875,-0.38197 4.58057,-0.20958 5.3391,0.41994 1.89805,1.57525 13.83567,0.0981 17.19461,-2.12761 1.53729,-1.01865 3.68471,-2.42109 4.77204,-3.11652 1.08733,-0.69543 2.45606,-1.86079 3.04163,-2.5897 0.8771,-1.0918 1.80882,-1.02752 5.28868,0.36484 3.28039,1.31255 4.83486,1.45381 6.95838,0.6323 1.50389,-0.58179 6.91667,-1.60009 12.02839,-2.26287 7.23102,-0.93757 9.51405,-1.61615 10.28519,-3.05703 1.07781,-2.01391 5.20588,-2.45446 9.10567,-0.97176 1.2733,0.48411 2.5401,0.84209 2.8151,0.79551 0.275,-0.0466 2.4458,1.00892 4.8241,2.34556 4.1971,2.35891 4.4123,2.37959 7.331,0.7045 1.6538,-0.94917 4.2455,-1.72577 5.7593,-1.72577 1.5137,0 3.0811,-0.3288 3.4829,-0.73066 0.4019,-0.40187 3.8519,-0.58648 7.6667,-0.41024 6.4709,0.29893 6.936,0.18028 6.936,-1.76934 0,-1.14937 -0.4766,-2.08976 -1.059,-2.08976 -0.5825,0 -0.7662,-0.47375 -0.4084,-1.05279 0.3579,-0.57903 1.1719,-0.87227 1.809,-0.65164 0.6371,0.22063 1.8914,-0.696 2.7873,-2.03695 2.1469,-3.21364 0.5748,-9.25862 -2.408,-9.25862 -1.7157,0 -1.8534,-0.43945 -1.1752,-3.75 0.4226,-2.0625 0.8699,-5.59343 0.994,-7.84651 0.2875,-5.21927 1.9909,-8.40349 4.4955,-8.40349 1.5788,0 1.9648,-0.68756 1.9648,-3.5 0,-1.925 0.4477,-3.5 0.9949,-3.5 0.5472,0 1.9347,-1.99936 3.0833,-4.44301 l 2.0885,-4.44302 4.9166,0.58231 c 4.5941,0.54409 4.9167,0.43586 4.9167,-1.64926 0,-1.22736 0.9,-3.37573 2,-4.77415 1.2165,-1.54651 2,-4.05678 2,-6.40773 0,-3.45615 0.2645,-3.86514 2.5,-3.86514 2.3774,0 2.5,-0.28249 2.5,-5.76265 0,-4.97952 0.3397,-6.01779 2.5,-7.64007 2.2345,-1.67806 2.5,-2.59454 2.5,-8.63036 0,-5.25044 -0.3538,-6.88872 -1.5902,-7.36318 -0.8747,-0.33562 -1.9842,-0.36679 -2.4656,-0.0693 -0.7196,0.44474 -6.4469,1.0767 -12.6942,1.40069 -0.7138,0.037 -1.25,1.37864 -1.25,3.12769 0,2.31815 -0.4255,3.01957 -1.75,2.88484 -3.6897,-0.37532 -4.25,0.093 -4.25,3.5523 0,2.83333 -0.381,3.5 -2,3.5 -1.1,0 -2.0005,-0.3375 -2.0012,-0.75 0,-1.54418 -4.7623,-6.20957 -7.3319,-7.18654 -2.871,-1.09152 -3.6221,-3.06343 -1.1669,-3.06343 0.825,0 1.5281,-0.1125 1.5624,-0.25 0.8375,-3.35468 0.8637,-10.69801 0.054,-15.07945 -0.8421,-4.5549 -1.7448,-6.28354 -4.5824,-8.77503 -4.6056,-4.0438 -4.5938,-5.89552 0.038,-5.89552 3.3075,0 3.5478,-0.20329 3.25,-2.75 l -0.3216,-2.75 7.6995,0.27865 c 6.5505,0.23706 7.8328,0.0132 8.593,-1.5 1.3779,-2.74295 0.09,-5.53811 -4.4137,-9.58009 -4.5538,-4.08677 -8.521,-4.78481 -11.5605,-2.03409 -1.7229,1.55918 -1.9809,1.53224 -4.0788,-0.42587 -1.2317,-1.14969 -3.5133,-2.4066 -5.0703,-2.79315 -1.5569,-0.38654 -3.0516,-1.27834 -3.3215,-1.98176 -0.4937,-1.28651 -10.1983,-6.02115 -11.5977,-5.65821 -0.4125,0.10699 -0.75,-0.26994 -0.75,-0.83761 0,-0.56768 -2.041,0.10732 -4.5355,1.5 -2.4945,1.39267 -6.0085,2.53213 -7.8089,2.53213 -1.8003,0 -4.14685,0.66069 -5.21447,1.4682 -2.52193,1.90749 -5.07761,1.92149 -5.80276,0.0318 -0.44493,-1.15947 -2.3824,-1.5 -8.53441,-1.5 -7.29832,0 -8.12199,-0.20747 -9.9253,-2.5 -2.03549,-2.58771 -4.59451,-3.25419 -5.68985,-1.4819 -0.38405,0.6214 -1.86822,0.13495 -3.80902,-1.24844 -1.74888,-1.24661 -3.89813,-2.26725 -4.7761,-2.26811 -0.87796,-8.5e-4 -2.22796,-0.52413 -3,-1.16283 -1.65632,-1.37029 -9.62883,-1.92249 -12.19599,-0.84473 -0.98576,0.41385 -3.92363,0.46972 -6.5286,0.12416 -3.78047,-0.5015 -5.53778,-0.19063 -8.70771,1.54039 -3.57244,1.95082 -5.27449,2.14607 -16.94309,1.94353 C 667.39051,547.45052 665,546.81665 665,543.56104 c 0,-2.64329 -1.9721,-2.9714 -12.51366,-2.08197 -12.24759,1.03338 -20.18497,-0.42466 -23.39988,-4.29839 -1.48124,-1.78479 -5.62514,-2.15962 -6.59138,-0.59622 -0.61307,0.99197 -4.53183,0.70539 -6.43457,-0.47056 -1.75625,-1.08542 -7.52658,2.0905 -11.01702,6.06364 -3.23836,3.68622 -3.73602,3.89715 -9.1206,3.86583 -3.13243,-0.0182 -6.30903,-0.53235 -7.05911,-1.14251 -0.75008,-0.61016 -5.18878,-1.3296 -9.86378,-1.59874 -8.46256,-0.4872 -12,-1.27555 -12,-2.67432 0,-1.23624 -7.09921,-2.93896 -15,-3.59771 -7.42356,-0.61896 -16.17751,-2.64644 -18.9181,-4.38157 -1.48447,-0.93986 -5.06467,0.80457 -8.28772,4.03813 -1.72196,1.72757 -2.52189,1.74339 -14.52087,0.28723 -2.32468,-0.28211 -4.50589,-0.96469 -4.84714,-1.51684 -0.34125,-0.55215 -1.58924,-1.38698 -2.77331,-1.85518 -1.18407,-0.4682 -3.79058,-1.55068 -5.79223,-2.40551 -3.51801,-1.50241 -3.72815,-1.47197 -6.30152,0.91295 -1.46419,1.35696 -3.26253,2.4672 -3.99632,2.4672 -0.7338,0 -2.62311,0.67223 -4.19848,1.49384 -3.26675,1.70372 -8.94413,1.99504 -9.86431,0.50616 -0.94727,-1.53271 -13.71687,-1.18759 -18.5,0.5 -5.40982,1.90869 -12.0582,1.92322 -14.55887,0.0318 -1.06762,-0.8075 -2.95974,-1.4825 -4.2047,-1.5 -1.24496,-0.0175 -3.18487,-0.5943 -4.3109,-1.2818 -1.7295,-1.05595 -2.25697,-0.96749 -3.3977,0.56977 -1.22751,1.65423 -1.43321,1.67173 -2.26109,0.19239 -0.8095,-1.44651 -1.65088,-1.49102 -7.56946,-0.40048 -5.10982,0.94152 -7.25568,0.95493 -9.22505,0.0576 -3.82685,-1.74363 -7.88503,-1.41904 -10.78578,0.8627 -1.76007,1.38447 -3.36876,1.83485 -5.0482,1.41334 -1.80103,-0.45203 -3.09068,0.0107 -4.78817,1.718 -4.92724,4.95571 -9.84645,5.60362 -12.65678,1.66703 -0.71869,-1.00668 -2.37587,-1.83035 -3.68262,-1.83035 -1.48722,0 -2.61025,-0.73836 -3.00243,-1.97402 -0.34459,-1.08571 -1.89708,-2.87873 -3.44997,-3.98448 -1.55289,-1.10576 -3.80506,-3.92995 -5.00482,-6.27598 -5.02471,-9.82541 -5.77175,-10.94044 -8.10687,-12.10033 -1.34562,-0.66839 -2.59525,-2.25357 -2.77694,-3.52263 -0.34272,-2.39381 -2.06642,-4.92066 -5.91965,-8.67794 -1.96916,-1.92012 -2.25,-3.20938 -2.25,-10.32929 0,-4.75689 0.41528,-8.13533 1,-8.13533 0.55,0 1,-0.94037 1,-2.08971 0,-2.64644 3.94478,-5.9919 6.25,-5.30044 1.52929,0.45872 1.75,-0.22486 1.75,-5.42002 0,-6.47189 -1.48399,-8.81954 -4.99467,-7.90147 C 344.9024,463.15328 344,462.98139 344,462.48288 c 0,-0.49851 -0.64047,-0.90638 -1.42327,-0.90638 -0.78281,0 -2.76363,-1.12783 -4.40183,-2.50629 -3.63864,-3.06171 -6.1749,-2.41353 -6.1749,1.5781 0,2.72257 -3.34432,5.9172 -4.73677,4.52475 -0.31101,-0.31101 -1.15816,0.21503 -1.88255,1.16898 -1.65651,2.18146 -1.78042,10.43472 -0.18068,12.03446 0.93333,0.93333 0.57622,1.2 -1.60699,1.2 -2.04041,0 -2.65513,-0.39573 -2.25093,-1.44907 0.37166,-0.96852 0.0755,-1.26467 -0.89301,-0.89301 -0.79699,0.30583 -1.44907,0.81641 -1.44907,1.13462 0,1.35294 4.49099,5.20746 6.06733,5.20746 1.99037,0 2.93267,1.95415 2.93267,6.08179 0,1.9273 -0.50934,2.91821 -1.5,2.91821 -0.825,0 -1.5,0.41968 -1.5,0.93261 0,0.51294 -0.9,1.21826 -2,1.56739 -1.39456,0.44262 -2,1.51303 -2,3.536 0,2.08539 -0.3964,2.74912 -1.40966,2.36029 -1.9348,-0.74245 -2.90326,2.79208 -2.0877,7.61933 0.48807,2.88885 0.14066,5.06527 -1.31014,8.20783 -1.08589,2.3521 -2.76677,6.18905 -3.73529,8.52655 -0.96853,2.3375 -2.33012,4.25 -3.02575,4.25 -0.69564,0 -1.41479,0.39233 -1.59813,0.87184 -0.65886,1.72325 -11.97312,6.12816 -15.74052,6.12816 -2.20042,0 -4.38092,0.64223 -5.09281,1.5 -1.41636,1.7066 -4.57671,1.99391 -5.5,0.5 -0.33992,-0.55 -2.09603,-1 -3.90247,-1 -1.80643,0 -5.81908,-0.87205 -8.91699,-1.93789 -6.7644,-2.32729 -10.76432,-6.50279 -15.03536,-15.69534 -2.68341,-5.77548 -2.88057,-6.82692 -1.82663,-9.74152 1.54284,-4.26666 1.49261,-6.81745 -0.17928,-9.1039 -1.14983,-1.57248 -1.13959,-2.70776 0.066,-7.3246 1.12781,-4.31885 1.17954,-6.06057 0.24685,-8.31226 -0.64895,-1.56671 -0.85973,-3.64415 -0.46839,-4.61653 1.06138,-2.63726 0.58766,-17.47698 -0.60373,-18.91252 -0.71185,-0.85772 -0.70401,-3.51934 0.0252,-8.55041 0.58232,-4.01777 0.85642,-10.23003 0.60911,-13.80503 -0.24731,-3.575 -0.4391,-10.05793 -0.4262,-14.4065 0.0152,-5.10663 -0.40274,-8.1699 -1.18006,-8.65032 -0.66194,-0.4091 -1.34849,-2.47617 -1.52567,-4.5935 -0.17718,-2.11732 -0.38215,-4.52468 -0.4555,-5.34968 -0.32229,-3.62516 0.69623,-13.62887 1.5212,-14.94098 0.58846,-0.93593 0.49345,-1.5785 -0.27105,-1.83334 -1.44271,-0.48091 -1.59733,-9.84788 -0.17703,-10.72568 0.55,-0.33992 1,-1.56854 1,-2.73028 0,-1.16173 0.77232,-2.96564 1.71626,-4.00869 1.49209,-1.64873 1.73376,-4.53268 1.85023,-22.07874 0.12835,-19.33659 0.2464,-20.47387 2.81737,-27.14072 3.04574,-7.89799 4.21718,-9.42646 10.32527,-13.4723 3.89542,-2.58021 4.75245,-2.78061 8.02616,-1.87669 4.2691,1.17875 12.54348,0.30622 15.62473,-1.64763 1.19365,-0.7569 6.78326,-1.68374 12.63998,-2.09589 15.85503,-1.11575 18.55514,-0.94415 21.49189,1.3659 1.43413,1.12808 3.37264,1.90681 4.30781,1.7305 0.93516,-0.1763 5.04382,-0.61967 9.13034,-0.98526 4.08652,-0.36559 7.72553,-0.84733 8.08669,-1.07054 0.36116,-0.22321 2.65531,0.65814 5.09812,1.95855 3.72381,1.98233 5.15508,2.23388 8.85783,1.55679 2.42899,-0.44418 5.45871,-0.41129 6.7327,0.0731 2.65693,1.01016 11.29462,0.0817 11.29462,-1.21401 0,-1.2368 6.75388,-1.07133 7.53001,0.18448 0.3781,0.61177 1.13166,0.68999 1.80902,0.18777 0.63853,-0.47343 1.83597,-0.78883 2.66097,-0.70087 0.825,0.0879 2.68502,0.22845 4.13337,0.31223 1.63706,0.0947 2.81624,0.85161 3.11672,2.00065 0.53022,2.02757 5.10112,3.47113 10.74991,3.39499 3.29532,-0.0444 8.18502,-1.96435 15.81377,-6.20924 3.23328,-1.79911 3.48442,-1.7956 10.34082,0.14471 5.41397,1.53211 7.63748,1.74988 9.68623,0.94867 1.46255,-0.57195 5.56996,-1.17212 9.12757,-1.3337 5.79277,-0.26309 6.50989,-0.0849 6.86569,1.70623 0.50372,2.5358 1.94847,3.46538 5.41592,3.48469 1.5125,0.008 2.75,0.39697 2.75,0.86344 0,0.46646 1.8174,1.66766 4.03867,2.66931 3.50733,1.58158 4.82558,1.67485 10.0198,0.70888 3.28962,-0.61177 7.1579,-2.03796 8.59619,-3.16931 1.43828,-1.13136 3.27711,-2.05701 4.08628,-2.05701 0.80917,0 2.35614,-1.125 3.43772,-2.5 1.56068,-1.98408 2.86675,-2.5 6.32882,-2.5 2.39928,0 5.5184,-0.43954 6.93138,-0.97676 1.53096,-0.58207 3.47664,-0.62279 4.8151,-0.10078 1.23532,0.48179 5.04428,1.66326 8.46436,2.62549 5.12108,1.44081 6.49324,1.52136 7.77635,0.45648 0.97713,-0.81095 3.95982,-1.22697 7.99996,-1.11582 5.14509,0.14155 7.4482,-0.33269 11.44041,-2.35569 6.09143,-3.08676 7.06496,-3.14059 7.06496,-0.39059 0,2.10414 0.19915,2.12972 11.17495,1.43521 6.38253,-0.40387 12.36519,-1.32262 13.95034,-2.14233 3.5809,-1.85176 5.87471,-1.82646 5.87471,0.0648 0,0.825 0.50248,1.5 1.11663,1.5 0.61783,0 0.887,0.87813 0.60256,1.96581 -0.28274,1.0812 -0.22272,1.92791 0.13337,1.88158 3.03419,-0.39476 4.14872,0.38238 4.16275,2.90261 0.0198,3.55275 1.42131,5.72474 3.13377,4.8565 4.06946,-2.06328 5.76718,-3.3569 5.17833,-3.94576 -0.36341,-0.36343 0.0893,-0.66076 1.00592,-0.66076 0.91667,0 1.66667,-0.45 1.66667,-1 0,-0.55 0.3375,-0.91428 0.75,-0.8095 1.42374,0.36163 7.7269,-1.45687 9.8331,-2.83691 1.16184,-0.76126 3.86955,-1.53309 6.01713,-1.71517 4.23593,-0.35913 9.30153,-2.6102 11.30437,-5.02347 0.69242,-0.83431 3.35964,-1.79264 5.92717,-2.12961 2.56753,-0.33698 6.35676,-1.32784 8.42053,-2.20192 3.46137,-1.46602 3.89597,-1.45922 5.60538,0.0878 1.95169,1.76626 5.14232,1.27792 5.14232,-0.78706 0,-0.66103 0.63873,-2.07539 1.41941,-3.14301 1.39504,-1.90781 1.46052,-1.90251 3.81445,0.30887 2.78722,2.61843 4.60235,2.84355 6.1559,0.76347 0.61063,-0.81759 2.51336,-1.76196 4.2283,-2.09861 2.67838,-0.52577 3.65833,-0.0718 6.9496,3.21947 3.73579,3.73579 3.98897,3.82346 10.12952,3.50767 5.58131,-0.28702 6.65019,-0.0275 9.39334,2.28071 3.01374,2.5359 3.35007,2.58695 12.75243,1.93585 8.53519,-0.59106 12.72294,-1.7889 15.15705,-4.33546 0.80698,-0.84426 7.26677,-3.20943 10.241,-3.74963 1.50756,-0.2738 4.60845,0.24937 6.89088,1.16262 2.5261,1.01075 6.54026,1.59698 10.25899,1.49825 3.36002,-0.0892 8.87455,0.16687 12.25453,0.56906 5.7048,0.67884 6.1935,0.57949 6.8174,-1.38607 0.4963,-1.56396 1.5038,-2.12372 3.8546,-2.14178 5.7727,-0.0443 12.1401,-2.05113 14.91,-4.69911 1.5001,-1.43404 3.7233,-2.68072 4.9405,-2.77039 2.3039,-0.16974 3.2092,-1.23768 4.7496,-5.6027 0.5371,-1.52196 2.4493,-3.32408 4.6203,-4.35428 2.0372,-0.9667 3.9271,-2.61071 4.1997,-3.65335 0.2727,-1.04265 0.8933,-1.89572 1.3791,-1.89572 0.4859,0 0.7709,-0.5625 0.6334,-1.25 -0.1561,-0.78038 1.149,-1.36601 3.4737,-1.5588 2.5674,-0.2129 4.349,-1.10378 5.7375,-2.86896 1.4558,-1.85081 2.6851,-2.43184 4.4368,-2.09699 1.8353,0.35085 2.6872,-0.11675 3.5125,-1.92809 0.5992,-1.3152 1.0895,-3.0495 1.0895,-3.854 0,-0.8045 0.9,-2.23334 2,-3.17519 1.6304,-1.39597 2,-2.94994 2,-8.40842 0,-3.68279 0.2782,-7.421 0.6183,-8.30715 0.5477,-1.42743 0.7473,-1.43889 1.75,-0.10045 1.4776,1.97244 3.9294,0.4873 3.0365,-1.83937 -0.4313,-1.12391 -1.2293,-1.48951 -2.2838,-1.04634 -0.8916,0.37465 -2.9543,0.97803 -4.5838,1.34085 -2.0429,0.45487 -3.1465,1.42551 -3.5544,3.1263 -0.5109,2.13032 -1.1567,2.46661 -4.7368,2.46661 -2.28,0 -4.708,0.5625 -5.3957,1.25 -1.9653,1.96486 -2.8432,1.51116 -4.4316,-2.29031 -0.8136,-1.94718 -1.9336,-3.25947 -2.489,-2.91621 -0.6332,0.39134 -0.7767,-0.3048 -0.3848,-1.86655 0.3439,-1.36986 0.1165,-3.4411 -0.5052,-4.60275 -0.8994,-1.68058 -0.7681,-2.72536 0.6427,-5.11367 1.4553,-2.4637 1.5531,-3.35383 0.5453,-4.96746 -1.7738,-2.84042 -1.6354,-2.99305 2.7156,-2.99305 2.5911,0 4.3914,0.60011 5.25,1.75 0.8503,1.13872 2.5293,1.70742 4.8067,1.6281 5.654,-0.19691 6,-0.30522 6,-1.8781 0,-1.00901 -1.0093,-1.5 -3.0833,-1.5 -3.5864,0 -3.5391,-1.85634 0.094,-3.68269 1.2938,-0.65048 2.4669,-2.00048 2.6068,-3 0.3997,-2.85559 2.4854,-9.66462 3.4667,-11.31731 3.2438,-5.46353 4.0851,-7.63242 4.5794,-11.80534 0.5502,-4.64558 0.506,-4.73394 -3.967,-7.94624 -2.4878,-1.78663 -5.0123,-3.24842 -5.6099,-3.24842 -0.5976,0 -1.0865,-0.45 -1.0865,-1 0,-0.55 0.45,-1 1,-1 1.5901,0 1.1677,-1.97131 -1.0175,-4.7494 -1.2289,-1.56225 -1.78,-3.31325 -1.4099,-4.47939 0.7268,-2.28978 -2.0895,-5.77121 -4.6686,-5.77121 -0.9823,0 -2.0641,-0.45 -2.404,-1 -1.1461,-1.85436 -4.1487,-1.01834 -7.0833,1.97222 -3.5835,3.65175 -4.1537,3.69904 -5.6265,0.46665 -0.8742,-1.91856 -1.7008,-2.42714 -3.2947,-2.02709 -2.2065,0.5538 -5.1294,-1.00299 -9.6006,-5.11343 -1.4328,-1.31721 -3.2328,-2.2607 -4,-2.09664 -0.8547,0.18277 -1.3949,-0.53811 -1.3949,-1.86135 0,-2.95258 -0.9729,-3.69284 -3.2509,-2.47366 -1.2896,0.69016 -4.1582,0.7121 -8.7159,0.0666 -4.9206,-0.69685 -7.1765,-0.64439 -8.1822,0.19029 -1.0664,0.88505 -1.7901,0.79201 -3.1198,-0.40108 -1.07001,-0.96018 -4.4046,-1.73818 -8.7312,-2.03712 -12.82098,-0.88585 -23.95083,-2.47742 -28.5,-4.07551 -5.96375,-2.09503 -10.77981,-2.01642 -15.22226,0.24847 -5.84978,2.98239 -10.35753,3.29312 -16.10301,1.11001 -3.91716,-1.48841 -5.81572,-1.71927 -8.14157,-0.99002 -10.61569,3.32846 -12.20066,3.66101 -14.03316,2.94435 -1.1,-0.43019 -3.16627,-0.8138 -4.59171,-0.85245 -2.13482,-0.0579 -2.80299,-0.77546 -3.79014,-4.07029 -1.3167,-4.39473 -1.81636,-4.67238 -4.66281,-2.591 -1.34475,0.9833 -2.46842,1.11918 -3.71928,0.44975 -0.98579,-0.52759 -4.14219,-0.86538 -7.01421,-0.75066 -3.11566,0.12446 -6.43188,-0.4105 -8.22185,-1.3263 -3.78376,-1.9359 -30.5,-2.57723 -30.5,-0.73217 0,0.79891 -1.56452,0.92054 -5.25,0.40815 -11.01384,-1.53124 -82.73456,-1.89049 -89.25124,-0.44706 -4.00131,0.88628 -11.20878,0.65117 -16.64578,-0.543 -1.58811,-0.34881 -7.76393,-0.0957 -13.72404,0.56247 -7.38628,0.81566 -11.44029,0.87505 -12.73275,0.18653 -2.55718,-1.36225 -23.00711,-1.60373 -57.39619,-0.67776 -27.21416,0.73278 -47.6668,0.9133 -58.5,0.51635 -2.75,-0.10077 -13.1,0.0216 -23,0.27189 -9.9,0.25031 -33.525,0.67995 -52.5,0.95475 -20.47895,0.29659 -35.87868,0.93866 -37.89237,1.57988 -1.86581,0.59413 -3.69833,0.89114 -4.07227,0.66004 -0.37394,-0.23111 -3.57237,0.0288 -7.10762,0.57751 -6.88199,1.06821 -29.27003,2.8147 -42.49831,3.31529 -11.03368,0.41755 -17.23751,2.65658 -22.81521,8.23427 -2.49652,2.49653 -4.79593,5.34824 -5.1098,6.33714 -0.49472,1.55874 -3.72465,3.36995 -5.63723,3.16114 -0.84349,-0.0921 -1.99872,5.83095 -1.34392,6.89045 0.77975,1.26165 -1.2644,9.95009 -3.40258,14.46234 -1.0425,2.2 -2.45722,5.8 -3.14382,8 -0.6866,2.2 -2.10484,5.21912 -3.15163,6.70916 -1.67699,2.38707 -1.82331,3.81373 -1.23076,12 0.36988,5.10996 1.17494,9.92227 1.78901,10.69403 0.72397,0.90986 1.18985,8.64457 1.3251,22 0.11472,11.32824 0.27261,20.59681 0.35085,20.59681 0.0782,0 0.24155,3.45711 0.36291,7.68246 0.12461,4.33849 0.76275,8.33565 1.46607,9.1831 1.03171,1.24312 0.80493,1.78926 -1.3215,3.18255 -2.27458,1.49036 -2.56692,2.35215 -2.56692,7.5669 0,3.23674 0.35028,5.88499 0.77841,5.88499 0.42812,0 0.60197,5.7375 0.38633,12.75 -0.5123,16.65926 -0.54024,18.72225 -0.34208,25.25 0.0918,3.025 0.13489,6.4 0.0957,7.5 -0.19324,5.4211 1.34296,17.77686 3.01541,24.25319 1.03019,3.98926 1.80404,9.50231 1.71966,12.25122 -0.0844,2.74892 0.29659,5.18695 0.84659,5.41786 0.55,0.23091 0.025,0.45536 -1.16667,0.49878 -3.25836,0.11873 -4.04911,5.07895 -0.80967,5.07895 2.36028,0 2.21121,2.43928 -0.35606,5.82622 -2.73199,3.60424 -2.55381,1.11473 -3.26882,45.67378 -0.181,11.28008 1.18805,19.7784 4.30713,26.73638 1.90759,4.25539 1.99068,5.13793 0.81817,8.69065 -0.85662,2.5956 -1.02955,5.26315 -0.50329,7.76362 1.06529,5.06162 1.18888,21.34347 0.17904,23.58736 -0.4401,0.9779 -1.2276,1.51385 -1.75,1.19098 -0.52241,-0.32286 -0.94983,0.33953 -0.94983,1.47199 0,1.13246 0.37206,2.05902 0.82681,2.05902 0.45474,0 0.62135,1.39985 0.37024,3.11079 -0.25111,1.71093 -0.011,3.39843 0.53366,3.75 1.57218,1.01488 4.03493,6.37304 4.79749,10.43783 0.38481,2.05124 1.43589,4.1595 2.33573,4.68504 0.89984,0.52554 1.18607,0.9761 0.63607,1.00124 -0.55,0.0251 -0.39306,0.43036 0.34875,0.90046 0.9095,0.57637 1.38612,3.21511 1.46351,8.10258 0.0982,6.20075 -0.1838,7.48962 -1.95192,8.92136 -3.75002,3.03658 -4.60676,5.71349 -2.89069,9.03201 0.84169,1.62765 1.53312,4.21922 1.53651,5.75903 0.003,1.53981 0.63727,4.00935 1.40863,5.48785 1.0191,1.95337 1.16154,3.73015 0.52109,6.5 -0.48476,2.0965 -0.94799,6.73681 -1.0294,10.31181 -0.0814,3.575 -0.80378,7.78304 -1.60527,9.35121 -1.35678,2.65465 -1.30612,2.95705 0.73488,4.38662 1.9724,1.38153 2.11432,2.04792 1.41597,6.64879 -0.42689,2.81236 -0.81573,12.42612 -0.86411,21.36391 -0.0484,8.9378 -0.46545,16.2503 -0.92684,16.25 -0.4614,-2.9e-4 0.35007,1.41248 1.80325,3.13949 1.45319,1.72701 2.41094,3.74256 2.12834,4.479 -0.67919,1.76995 1.81591,7.63283 2.82908,6.64763 0.43362,-0.42166 0.0661,0.97581 -0.81668,3.10547 -0.88281,2.12967 -1.6051,5.75217 -1.6051,8.05 0,2.29784 -0.54,4.71788 -1.2,5.37788 -0.93333,0.93333 -0.93333,1.46667 0,2.4 0.93333,0.93333 1.2,0.80911 1.2,-0.55902 0,-0.96746 0.45,-1.4809 1,-1.14098 1.54493,0.95482 1.18142,5.21641 -0.5,5.86163 -0.825,0.31658 -1.50277,1.60222 -1.50616,2.85699 -0.003,1.25476 -0.67839,3.57032 -1.5,5.14569 -1.96738,3.77228 -1.88868,4.87442 0.54879,7.68485 2.29911,2.65089 5.95737,10.43567 5.95737,12.67728 0,0.80971 3.61797,5.02751 8.03993,9.37288 7.26932,7.14342 8.41384,7.90068 11.94098,7.90068 2.14558,0 4.17917,0.45 4.51909,1 1.09253,1.76776 5.21172,1.06677 6.67416,-1.13578 1.41322,-2.12842 1.43174,-2.12326 5.37197,1.49522 3.8028,3.49227 6.75324,4.43206 9.02681,2.87525 z M 830.655,629.74776 c -2.3255,-2.56964 -2.2261,-8.17126 0.145,-8.17126 2.8051,0 4.2,2.05912 4.2,6.2 0,4.24051 -1.6244,4.97748 -4.345,1.97126 z m -39.5811,-53.58223 c -0.8366,-1.00807 -0.8591,-1.60376 -0.079,-2.08609 1.1601,-0.71695 4.0048,1.14378 4.0048,2.6195 0,1.38193 -2.6335,1.02413 -3.9261,-0.53341 z M 839,681.5765 c 0,-1.46667 -0.6667,-2 -2.5,-2 -1.8333,0 -2.5,0.53333 -2.5,2 0,1.46667 0.6667,2 2.5,2 1.8333,0 2.5,-0.53333 2.5,-2 z m -16,-104 c 0,-1.33333 -0.6667,-2 -2,-2 -1.3333,0 -2,0.66667 -2,2 0,1.33333 0.6667,2 2,2 1.3333,0 2,-0.66667 2,-2 z M 335,389.65342 c 0,-0.50769 1.35,-2.27307 3,-3.92307 2.61392,-2.61392 3,-3.71555 3,-8.56008 l 0,-5.56008 -5.25,-2.71967 c -4.79259,-2.48271 -5.97404,-2.81667 -8.62868,-2.43902 -1.98098,0.28181 -3.06921,5.7144 -2.27285,11.34636 0.62988,4.45462 1.40044,6.18659 3.48027,7.82258 1.46919,1.15567 2.67126,2.74356 2.67126,3.52864 0,0.78508 0.9,1.42742 2,1.42742 1.1,0 2,-0.41538 2,-0.92308 z M 823,229.01748 c 0,-4.11803 -0.3722,-6.32901 -1,-5.94098 -0.55,0.33992 -1,3.29148 -1,6.55902 0,3.29399 0.4455,5.94098 1,5.94098 0.565,0 1,-2.85301 1,-6.55902 z m 20,-2.88196 c 0,-0.79254 -0.45,-1.7191 -1,-2.05902 -0.55,-0.33992 -1,0.30852 -1,1.44098 0,1.13246 0.45,2.05902 1,2.05902 0.55,0 1,-0.64844 1,-1.44098 z m 214.393,-265.140811 c 1.0587,-2.758981 0.6972,-3.737967 -0.893,-2.418213 -1.637,1.358564 -2.0378,4 -0.607,4 0.4912,0 1.1662,-0.711804 1.5,-1.581787 z"
+         id="path3125"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#675037"
+         d="m -27.98545,965.8265 c 0.0339,-1.7449 3.24546,-9.8708 4.44636,-11.25 0.71834,-0.825 2.28192,-3.3 3.47463,-5.5 1.1927,-2.2 3.29513,-5.8 4.67205,-8 2.50145,-3.99673 2.50319,-4.01723 2.12604,-25.07086 l -0.37746,-21.07085 -3.17471,-6.42915 c -3.72957,-7.55277 -8.4594,-15.2823 -11.72978,-19.16893 -1.38967,-1.65154 -2.56721,-4.68545 -2.91674,-7.51496 -0.3224,-2.60989 -1.04084,-7.03588 -1.59653,-9.83553 -0.63954,-3.22208 -0.66636,-5.99505 -0.0731,-7.55549 0.53874,-1.41698 0.59004,-4.35504 0.12065,-6.90972 -0.86433,-4.70413 0.48767,-46.60087 1.886,-58.44451 0.88515,-7.49715 5.52081,-17.94423 11.04916,-24.90075 4.08482,-5.14008 4.98229,-10.66504 4.72684,-29.09925 -0.21606,-15.59098 -0.79947,-19.30415 -4.79223,-30.50055 -0.49045,-1.3753 -3.1419,-4.94812 -5.89212,-7.9396 C -31.57717,680.60948 -35,671.92713 -35,663.89923 c 0,-2.97778 -0.84585,-5.90992 -2.53764,-8.79674 -2.52555,-4.30953 -2.53225,-4.38416 -1.40757,-15.67807 0.62153,-6.24135 1.52485,-11.82763 2.00738,-12.41393 0.50627,-0.61516 0.40993,-4.86215 -0.22778,-10.04157 -1.04997,-8.52765 -0.97061,-9.43267 1.59022,-18.1362 1.80907,-6.14849 2.59952,-10.90821 2.40392,-14.47533 -0.28228,-5.14818 -0.10984,-5.53941 5.50442,-12.48807 9.25982,-11.4607 10.00435,-14.25265 9.81157,-36.79282 -0.19265,-22.52551 -0.77906,-24.88624 -8.81881,-35.50239 -6.88761,-9.0948 -8.28732,-12.79952 -9.32591,-24.68372 -0.44153,-5.05236 -1.04966,-9.58555 -1.35139,-10.07377 -1.08227,-1.75113 -1.51702,-14.45551 -0.5791,-16.92242 0.52656,-1.38497 0.96433,-13.61053 0.97281,-27.16791 0.0206,-32.8813 0.17526,-34.03644 5.34649,-39.92302 6.43925,-7.33 9.30282,-12.28462 10.2454,-17.72677 1.41137,-8.14888 0.97632,-43.57071 -0.5701,-46.41715 -0.72226,-1.32944 -3.36055,-4.92944 -5.86288,-8 -6.54067,-8.02594 -10.49448,-17.21083 -10.36694,-24.08285 0.13235,-7.13119 -1.66442,-24.47767 -3.01681,-29.125 -0.79157,-2.72012 -0.72464,-4.59228 0.26813,-7.5 0.82005,-2.40186 1.41528,-9.76756 1.56573,-19.375 0.13349,-8.525 0.697,-17.525 1.25224,-20 0.55523,-2.475 1.02912,-6.43485 1.05307,-8.79966 0.049,-4.83656 1.83707,-8.83943 6.56663,-14.70034 1.77532,-2.2 4.02638,-5.57064 5.00235,-7.49032 5.02852,-9.89086 4.56676,-48.09369 -0.70647,-58.44772 -0.57758,-1.13408 -2.97024,-4.08696 -5.31702,-6.56196 -3.00444,-3.16859 -4.96735,-6.57108 -6.6344,-11.5 -2.35088,-6.950734 -2.36726,-7.309704 -2.32776,-51.000004 0.0445,-49.23838 0.13616,-49.992058 7.20558,-59.253502 6.50726,-8.524963 8.45568,-14.223265 8.9279,-26.110203 0.23239,-5.849962 0.63455,-11.648795 0.89369,-12.886295 l 0.47115,-2.25 522.12769,0 522.12771,0 -0.622,7.358083 c -0.3421,4.046946 -0.2956,7.684446 0.1033,8.083334 0.3988,0.398887 0.7252,1.05897 0.7252,1.466851 0,1.509603 6.0513,7.091732 7.6877,7.091732 0.9319,0 1.9764,0.45643 2.3211,1.01429 1.2288,1.988169 8.4717,4.98571 12.047,4.98571 1.9995,0 4.8299,0.839735 6.2898,1.866077 1.4599,1.026343 4.0044,2.124074 5.6544,2.439402 1.65,0.315329 4.259,0.882168 5.7978,1.259643 2.115,0.518808 3.1323,0.228894 4.1683,-1.18783 0.7537,-1.030781 1.7045,-1.540022 2.1129,-1.131646 0.4084,0.408376 1.234,-0.267331 1.8348,-1.501572 0.6007,-1.234241 3.2284,-3.265253 5.8392,-4.513361 3.534,-1.689402 4.7561,-2.839315 4.7824,-4.5 0.02,-1.226892 0.6786,-3.355713 1.4646,-4.730713 2.0765,-3.632455 1.8197,-5 -0.9387,-5 -2.1156,0 -2.5262,-0.583163 -3.0988,-4.401238 -0.363,-2.420681 -0.3602,-5.345681 0.01,-6.5 l 0.6623,-2.098762 56.4326,0 56.4326,0 0,508.500004 0,508.5 -609.5,0 c -335.225,0 -609.49345,-0.3375 -609.48545,-0.75 z M 1082.5167,904.15752 c 2.0773,-1.36109 2.3754,-2.32482 2.3502,-7.59688 -0.025,-5.1993 -0.4191,-6.46524 -2.8378,-9.11342 -2.1946,-2.40283 -3.3035,-2.91842 -5.0703,-2.35765 -1.8184,0.57713 -2.1405,0.40283 -1.6445,-0.88978 0.7581,-1.97557 -3.0185,-4.07034 -8.9841,-4.98321 -3.3082,-0.50623 -5.1964,-0.12246 -9.1378,1.85717 -3.9971,2.00765 -5.8485,2.37456 -9.4742,1.8776 -4.8718,-0.66775 -4.6243,-0.91201 -6.2071,6.12515 -0.3711,1.65 -0.5254,3.04334 -0.3429,3.09631 0.1825,0.053 -0.3262,0.88916 -1.1305,1.85821 -1.3009,1.56759 -1.2458,1.92019 0.5,3.19712 1.0793,0.78937 2.9219,1.67618 4.0947,1.97068 1.1728,0.2945 2.6048,1.51246 3.1823,2.70657 0.5775,1.19411 1.0804,1.60861 1.1176,0.92111 0.1079,-1.99242 1.747,-1.47044 5.3691,1.7098 6.4507,5.66377 19.2555,5.49187 28.2153,-0.37878 z M 249.5,861.54072 c 7.15,-0.5376 19.075,-0.905 26.5,-0.81645 22.19396,0.26467 44.48725,-0.30775 58.91735,-1.51283 8.18971,-0.68393 16.17181,-0.80645 20.08648,-0.3083 9.00711,1.14615 10.75384,1.17023 25.49617,0.35141 19.62658,-1.0901 44.12392,-1.71224 84.5,-2.14599 20.075,-0.21566 40.1,-0.65116 44.5,-0.96777 4.4,-0.31662 20.375,-0.82911 35.5,-1.13887 15.125,-0.30976 28.625,-0.59219 30,-0.62762 1.375,-0.0354 6.18274,0.28498 10.68386,0.71201 5.54048,0.52564 10.22397,0.36927 14.5,-0.48411 3.47388,-0.69329 10.36614,-1.22912 15.31614,-1.19073 5.58311,0.0433 10.69653,-0.50527 13.4686,-1.44493 3.45337,-1.17061 6.52047,-1.34699 13.5,-0.77637 4.96727,0.4061 12.6314,0.69663 17.0314,0.64562 18.68731,-0.21664 19.92521,-0.3534 21.85212,-2.41414 1.17114,-1.25247 2.45801,-1.72521 3.5,-1.28575 0.90633,0.38225 3.44788,0.79837 5.64788,0.9247 2.2,0.12633 5.40683,0.54261 7.12629,0.92508 2.11951,0.47145 3.57186,0.24981 4.5099,-0.68823 0.76099,-0.76099 2.61666,-1.69309 4.12371,-2.07133 1.50706,-0.37825 2.7401,-1.15571 2.7401,-1.72769 0,-0.57875 0.55436,-0.69617 1.25,-0.26475 0.6875,0.42637 4.77338,0.91274 9.07973,1.08082 7.14445,0.27886 8.09203,0.0849 10.82673,-2.21619 1.64834,-1.387 3.38591,-2.52181 3.86125,-2.52181 1.55529,0 2.17888,2.0582 1.03953,3.43103 -1.62697,1.96038 5.39035,2.62828 10.17066,0.96803 2.05034,-0.71211 6.44791,-1.60248 9.77237,-1.9786 3.32447,-0.37612 6.28597,-1.07459 6.58112,-1.55216 0.29516,-0.47756 2.05853,-0.8683 3.91861,-0.8683 3.5838,0 5.5923,-1.70688 3.5174,-2.98924 -0.68133,-0.42109 -2.02433,-0.5602 -2.98443,-0.30913 -1.36753,0.35762 -1.87937,-0.3677 -2.36313,-3.34874 -0.33963,-2.09287 -0.19438,-4.22835 0.32276,-4.74549 0.58703,-0.58703 -0.0349,-1.84404 -1.65547,-3.34592 -2.82539,-2.61849 -0.96064,-2.56816 -25.65642,-0.6925 -7.08637,0.53821 -8.14021,0.37535 -11.24316,-1.73755 -1.88314,-1.28229 -3.42696,-2.66893 -3.43072,-3.08143 -0.004,-0.4125 -1.69433,-0.68258 -3.75683,-0.60017 -3.01644,0.12052 -3.21205,0.23133 -1,0.56642 3.87308,0.58673 3.42993,2.28375 -0.59636,2.28375 -1.8405,0 -4.653,0.62276 -6.25,1.38391 -1.9624,0.9353 -4.95956,1.21833 -9.24596,0.87313 -6.02938,-0.48558 -6.31994,-0.62787 -5.88868,-2.88391 0.61777,-3.23164 -1.96396,-3.13673 -3.45095,0.12687 -1.50388,3.30065 -4.21779,3.37145 -3.59121,0.0937 0.38169,-1.99665 -0.0222,-2.50275 -2.37248,-2.97281 -1.55787,-0.31157 -3.45608,-0.3272 -4.21826,-0.0347 -1.17541,0.45104 -15.83132,1.11792 -30.04685,1.3672 -2.15091,0.0377 -4.47172,0.53414 -5.15736,1.10317 -0.68563,0.56903 -4.17773,1.24605 -7.76022,1.50448 -3.58249,0.25843 -8.46168,0.82512 -10.84264,1.2593 -7.53463,1.37398 -10.28809,0.96794 -10.64858,-1.5703 -0.18778,-1.32219 -1.0125,-2.24369 -2,-2.23469 -1.30207,0.0119 -1.38011,0.2057 -0.3466,0.86084 1.07393,0.68077 1.02522,0.96395 -0.25,1.4533 -2.26779,0.87023 -5.19253,-0.33523 -3.44051,-1.41804 0.72107,-0.44565 -7.52571,-0.72052 -18.32618,-0.61084 -10.80047,0.10969 -19.47981,0.35983 -19.28741,0.55588 0.65924,0.67174 -3.0286,3.89504 -5.22977,4.571 -2.35775,0.72404 -7.84618,-1.56606 -8.50743,-3.54981 -0.29316,-0.87946 -0.91225,-0.88394 -2.52966,-0.0183 -1.27106,0.68025 -2.37452,0.76908 -2.71477,0.21855 -0.615,-0.99509 -53.17755,-0.5826 -69.54812,0.54579 -5.225,0.36015 -10.76395,1.2924 -12.30878,2.07166 -2.0866,1.05255 -4.78633,1.24984 -10.5,0.7673 -4.23017,-0.35725 -8.70372,-0.61253 -9.94122,-0.56728 -1.2375,0.0453 -2.25,-0.31021 -2.25,-0.7899 0,-1.53477 -3.29635,-1.78945 -11.5,-0.8885 -10.95091,1.20266 -32.55671,1.70185 -35,0.80866 -3.94137,-1.44085 -56.38735,2.77339 -60.25155,4.84144 -2.72616,1.459 -16.72639,1.80406 -18.3981,0.45346 -2.77375,-2.24096 -50.45297,0.2749 -53.52482,2.82431 -0.69603,0.57765 -2.51651,1.22887 -4.04552,1.44717 -1.529,0.21829 -4.65202,0.6678 -6.94004,0.99891 -3.35899,0.48611 -4.74976,0.16602 -7.22268,-1.66229 -2.6897,-1.98858 -4.1651,-2.2491 -12.11597,-2.1394 -4.97932,0.0687 -9.60411,0.48174 -10.27732,0.91786 -0.6732,0.43612 -4.824,0.86177 -9.224,0.94589 -4.4,0.0841 -12.3875,0.47529 -17.75,0.86928 -9.71522,0.71378 -9.75,0.72584 -9.75,3.38145 0,1.90076 -0.8604,3.17336 -3,4.43726 -3.68391,2.17614 -3.85278,3.65907 -0.41667,3.65907 3.77209,0 2.47115,2.38548 -1.66282,3.04903 l -3.42051,0.54904 3.36977,0.80672 c 1.85337,0.44371 4.73262,2.10914 6.39831,3.70097 3.07324,2.93695 5.56113,3.62012 7.28192,1.99959 0.5225,-0.49205 2.38951,-1.19776 4.14891,-1.56823 2.58868,-0.54509 3.44531,-0.27904 4.49055,1.39465 0.75445,1.20806 2.34674,2.06823 3.82858,2.06823 1.39532,0 3.45487,0.64293 4.57676,1.42874 3.50559,2.45541 11.92238,2.88757 29.9052,1.53548 z m -47.80049,-21.3049 c -0.28296,-0.73738 -0.15447,-1.92317 0.28552,-2.6351 0.60353,-0.97653 1.07198,-0.78622 1.90748,0.77494 1.4422,2.69477 1.39706,3.20084 -0.28552,3.20084 -0.76616,0 -1.62452,-0.60331 -1.90748,-1.34068 z M 480,828.0765 c -1.34028,-1.61493 -1.46455,-1.57456 5.74979,-1.86787 1.78739,-0.0727 3.24989,0.003 3.25,0.1689 2.2e-4,0.31315 -6.62597,3.19897 -7.34523,3.19897 -0.22532,0 -0.96987,-0.675 -1.65456,-1.5 z m -309.45859,23.75 c -0.11763,-5.30591 -2.02415,-8.25331 -5.32659,-8.23469 -2.12019,0.012 -2.38627,0.22764 -1.21482,0.98469 0.825,0.53316 1.05,0.98995 0.5,1.0151 -0.55,0.0251 -0.2125,0.50439 0.75,1.065 0.9954,0.57977 1.75,2.20521 1.75,3.76959 0,2.52775 1.53386,5.15031 3.01227,5.15031 0.33675,0 0.57487,-1.6875 0.52914,-3.75 z m 10.52433,0.71482 c 2.79724,-1.49704 2.44511,-3.96482 -0.56574,-3.96482 -2,0 -2.5,0.5 -2.5,2.5 0,2.79758 0.30403,2.94284 3.06574,1.46482 z M 797.1842,842.3265 c 0.5476,-3.81094 -2.6303,-6.2522 -7.9857,-6.13468 -5.2134,0.11441 -9.5801,0.99341 -12.881,2.59288 -1.2004,0.58165 -2.9898,0.74777 -3.9765,0.36915 -1.4534,-0.5577 -1.3679,-0.23485 0.4503,1.70046 2.1858,2.32667 5.2087,3.22944 5.2087,1.55552 0,-0.45833 1.3132,-0.83333 2.9182,-0.83333 4.2229,0 6.6273,-1.03885 4.9156,-2.12385 -0.8653,-0.54852 -0.016,-0.8509 2.4162,-0.86084 2.0625,-0.008 3.7013,0.32219 3.6418,0.73469 -0.3078,2.13476 1.5645,5.25 3.1553,5.25 1.1185,0 1.9377,-0.86249 2.1371,-2.25 z M 183,841.18349 c 0,-0.76616 -0.7118,-1.66616 -1.58179,-2 -2.54204,-0.97547 -10.24378,-0.69824 -10.91821,0.39301 -1.27096,2.05646 0.79193,3 6.55902,3 4.41141,0 5.94098,-0.35865 5.94098,-1.39301 z m 609,-11.54797 c 0,-0.51754 -0.4715,-1.23242 -1.0479,-1.58862 -1.4677,-0.90709 -4.2112,0.30138 -3.4565,1.52254 0.7866,1.27268 4.5044,1.32722 4.5044,0.0661 z M 226.25432,789.19164 c 12.07521,-0.11923 14.02641,-0.36538 14.87189,-1.87619 0.53524,-0.95642 1.79571,-1.73895 2.80104,-1.73895 1.00532,0 2.4166,-0.70939 3.13617,-1.57642 0.96721,-1.16541 2.23757,-1.40281 4.87245,-0.91052 1.96027,0.36625 4.01413,1.03537 4.56413,1.48694 1.27298,1.04515 8.52489,2.49581 10.5,2.1004 0.825,-0.16517 1.81973,-0.81563 2.21051,-1.44548 0.48813,-0.78674 1.142,-0.55509 2.08909,0.74013 1.31357,1.79641 1.99983,1.8256 14.55344,0.61907 10.47737,-1.00697 14.07652,-1.01378 17.57867,-0.0332 3.21036,0.89885 8.42342,1.02177 19.23605,0.45359 17.75388,-0.93292 20.25392,-1.00392 64.20142,-1.8231 18.90305,-0.35236 34.65305,-0.80608 35,-1.00827 1.31299,-0.76516 59.44761,-2.29253 114.63082,-3.01168 14.3,-0.18636 28.7,-0.84497 32,-1.46357 3.3,-0.61861 9.6,-1.0546 14,-0.96888 12.6757,0.24694 20.94655,-0.28879 21.64261,-1.40188 0.4355,-0.6964 1.69713,-0.66 3.91439,0.11293 2.47266,0.86198 4.07074,0.85164 6.54296,-0.0423 2.53582,-0.91696 4.18949,-0.90774 7.35618,0.041 2.24675,0.67315 4.50295,0.96559 5.01379,0.64987 0.51083,-0.31571 8.23347,-0.73644 17.16142,-0.93495 12.77768,-0.2841 16.46014,-0.67206 17.30154,-1.82274 0.71386,-0.97626 1.73293,-1.20268 3.06801,-0.68164 5.47922,2.13835 22.19448,-0.32546 25.63819,-3.77903 2.02117,-2.02697 1.574,-3.07447 -2.38909,-5.59637 -2.08452,-1.32648 -2.75,-2.54295 -2.75,-5.0269 0,-1.80232 0.5625,-3.84724 1.25,-4.54427 1.0017,-1.01559 0.88302,-1.53831 -0.59752,-2.63155 -2.65941,-1.96374 -36.69307,-1.12623 -40.97171,1.00824 -2.13035,1.06275 -3.344,1.18508 -4.25515,0.4289 -1.82845,-1.51748 -33.34213,-1.75432 -35.94088,-0.27012 -1.44366,0.8245 -4.42188,0.89225 -10.5,0.23884 -15.77521,-1.69587 -36.23239,-2.4416 -44.88151,-1.63607 -4.73178,0.44069 -29.97823,0.97859 -56.10323,1.19532 -53.60799,0.44473 -77.11573,1.13063 -81.5,2.37797 -1.65,0.46943 -16.05,0.73504 -32,0.59023 -15.95,-0.1448 -32.375,0.16853 -36.5,0.69629 -7.82096,1.00064 -20.69073,1.41941 -72.5,2.35907 -17.05,0.30924 -33.7,0.8657 -37,1.23658 -3.3,0.37089 -11.75848,0.54617 -18.79663,0.38952 -10.72861,-0.23878 -13.21955,-0.008 -15.41357,1.42987 -1.43932,0.94308 -3.78084,2.0238 -5.20337,2.4016 -2.32701,0.61801 -2.68746,1.38229 -3.59368,7.61977 -0.89233,6.14188 -1.27254,6.97055 -3.33246,7.26322 -2.60862,0.37062 -5.70234,-1.97115 -6.46698,-4.89512 -0.34918,-1.33528 0.007,-1.93999 1.15031,-1.95055 1.43628,-0.0133 1.45706,-0.14592 0.15638,-0.99823 -0.825,-0.5406 -2.76772,-0.71632 -4.31716,-0.39048 -1.92947,0.40576 -3.4262,0.0413 -4.75,-1.15676 -2.05577,-1.8605 -2.59766,-4.43927 -0.93284,-4.43927 0.55,0 1,-0.40273 1,-0.89496 0,-1.55034 -8.35117,-1.92415 -10.07874,-0.45115 -0.86831,0.74036 -3.26831,1.34611 -5.33333,1.34611 -4.32315,0 -4.60617,2.30081 -0.34545,2.80826 3.01284,0.35882 4.17249,2.54784 2.75393,5.19844 -2.92457,5.46461 -0.19734,10.18662 5.7647,9.98118 10.50711,-0.36206 15.96115,0.24674 19.17571,2.14047 2.74531,1.61728 4.55618,1.91786 9,1.49389 3.26454,-0.31147 7.42253,0.0111 10.06318,0.78059 2.475,0.72125 5.36751,1.09495 6.42779,0.83045 1.06029,-0.2645 8.18223,-0.54267 15.82653,-0.61814 z m 370.76815,-14.57315 c -0.83872,-1.56717 -0.66816,-2.16124 0.85443,-2.97611 1.55813,-0.83389 2.00405,-0.62915 2.46448,1.13155 1.01975,3.89955 -1.47659,5.28695 -3.31891,1.84456 z M 225,764.5765 c 0,-0.55 0.9,-1 2,-1 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.1,0 -2,-0.45 -2,-1 z m -35.63837,-0.5 c -0.31659,-0.825 -1.25756,-1.5 -2.09106,-1.5 -1.23369,0 -1.284,0.27889 -0.27057,1.5 0.68469,0.825 1.62567,1.5 2.09106,1.5 0.46539,0 0.58715,-0.675 0.27057,-1.5 z M 248.5,736.07822 c 12.1,-0.35779 45.4,-0.80721 74,-0.99872 28.6,-0.1915 56.77539,-0.60603 62.61198,-0.92118 5.83658,-0.31514 12.68159,-0.18634 15.21112,0.28623 2.77461,0.51835 8.08583,0.44059 13.38803,-0.19602 4.83388,-0.58037 20.48887,-1.15977 34.78887,-1.28754 90.28267,-0.80669 117.3361,-1.29233 128,-2.29778 7.55058,-0.71191 25.53366,-0.96834 48.5,-0.69159 21.48115,0.25886 39.58607,0.0274 44,-0.56258 7.10271,-0.94932 25.00579,-1.52165 67.00811,-2.14211 10.17946,-0.15037 19.00077,-0.57789 19.60292,-0.95003 0.60215,-0.37215 3.8684,-0.22997 7.25833,0.31596 4.63414,0.74631 8.41404,0.63034 15.23344,-0.46736 4.9884,-0.80298 9.7302,-1.20657 10.5373,-0.89686 2.1233,0.81477 9.1024,-2.5995 9.6582,-4.72489 0.392,-1.49884 1.1822,-1.71249 4.6256,-1.25064 2.9597,0.39699 5.1255,0.0332 7.5387,-1.26641 2.5476,-1.37194 3.9344,-1.57869 5.601,-0.835 1.5117,0.67449 4.1181,0.59628 8.2067,-0.24627 10.6683,-2.1985 18.0397,-5.51668 20.9251,-9.41932 1.1994,-1.62229 2.9561,-2.94961 3.9038,-2.94961 2.2032,0 6.73,-5.34894 7.4703,-8.82707 0.3129,-1.47011 1.0363,-3.79793 1.6075,-5.17293 2.6492,-6.37671 3.5103,-11.83827 2.3156,-14.68553 -0.6496,-1.54796 -1.5012,-6.77089 -1.8924,-11.60651 -0.634,-7.83622 -0.4903,-9.14964 1.3216,-12.08139 2.6089,-4.22136 2.5064,-13.4335 -0.1718,-15.43327 -2.3638,-1.76501 -2.2027,-4.65749 0.428,-7.683 4.2066,-4.83802 4.8814,-8.86064 4.1952,-25.0103 -0.3505,-8.25 -0.9868,-15.45 -1.414,-16 -0.8934,-1.15023 -0.4962,-13.65635 0.5639,-17.75711 0.6046,-2.3388 0.1639,-3.25988 -2.9052,-6.071 -2.7615,-2.52945 -3.6179,-4.09766 -3.6179,-6.62486 0,-3.56076 -3.1221,-9.45634 -5.8019,-10.95605 -1.0336,-0.57845 -2.371,-0.53363 -3.5931,0.12042 -1.5145,0.81054 -2.2265,0.65915 -3.2072,-0.68199 -1.7812,-2.43595 -0.7373,-4.29593 2.8536,-5.08462 5.5791,-1.22539 0.1559,-2.82967 -10.4722,-3.09785 -5.3464,-0.13492 -10.5971,-0.71428 -11.6681,-1.28749 -1.0711,-0.57321 -3.2394,-0.78379 -4.8185,-0.46797 -1.7258,0.34516 -5.235,-0.25663 -8.7972,-1.50863 -6.9886,-2.45631 -10.2452,-2.61922 -12.4512,-0.62286 -2.2804,2.06375 -17.8509,2.05644 -21.0659,-0.01 C 777.1652,533.50394 772,533.0431 766.5,533.0024 c -5.5,-0.0407 -14.46522,-0.6629 -19.92271,-1.38269 -7.4415,-0.98145 -10.37623,-1.02547 -11.73643,-0.17601 -2.75855,1.72274 -3.84086,1.37195 -3.84086,-1.24487 0,-1.30765 -0.5625,-2.82768 -1.25,-3.37784 -0.72094,-0.57692 -6.82711,-0.91828 -14.42684,-0.80653 l -13.17683,0.19378 -2.97438,3.18407 c -2.55855,2.73895 -3.72213,3.21013 -8.32316,3.3704 -6.63007,0.23094 -10.31918,0.43217 -24.85714,1.35588 l -11.50836,0.73121 -8.99164,-3.81606 c -4.94541,-2.09884 -12.53627,-6.42729 -16.86859,-9.61879 l -7.87694,-5.80272 -2.87781,2.42152 c -1.69071,1.42263 -4.83525,2.6963 -7.62306,3.08764 -3.59429,0.50455 -5.51198,1.4794 -7.90638,4.0192 -1.73862,1.8442 -4.43862,3.65227 -6,4.01795 -1.56138,0.36567 -5.50443,1.54036 -8.76234,2.61042 -10.90775,3.58264 -23.01017,1.08644 -31.28681,-6.45312 -1.83453,-1.67116 -2.93952,-1.88653 -6.5,-1.26686 -5.66223,0.98546 -8.94962,1.04004 -10.82889,0.1798 -0.95735,-0.43823 -3.31929,0.47454 -6.24837,2.41468 -8.45919,5.60314 -25.78762,6.20592 -33.48152,1.16468 -1.28135,-0.83958 -4.4131,-5.84768 -6.95942,-11.12913 -2.54633,-5.28144 -5.68415,-10.88658 -6.97292,-12.45587 l -2.34324,-2.85325 0.44691,3.60325 c 0.39984,3.22364 0.20438,3.60325 -1.85523,3.60325 -1.26618,0 -2.86235,-0.675 -3.54704,-1.5 -1.72896,-2.08327 -3.73024,-1.87256 -5.01499,0.52801 -0.59695,1.1154 -1.4902,1.7778 -1.98501,1.47199 -1.35457,-0.83717 -2.68414,2.3666 -3.50593,8.44799 -1.3406,9.92056 -7.49456,13.30362 -23.95572,13.16936 -14.21067,-0.1159 -18.65374,-2.11845 -20.58111,-9.27615 -1.22599,-4.55299 -2.3798,-4.72971 -8.7477,-1.33981 l -4.69884,2.50139 -1.68947,-2.23978 -1.68946,-2.23977 -1.08652,2.98838 c -3.40727,9.37143 -6.74336,11.44311 -20.11994,12.49426 -13.45007,1.05693 -17.17541,-0.14966 -21.67531,-7.02036 -2.99914,-4.57926 -3.25114,-5.59997 -3.26478,-13.2239 -0.008,-4.54388 -0.6369,-10.96161 -1.39728,-14.26161 -0.96634,-4.19394 -1.41473,-13.72983 -1.48958,-31.6796 -0.0589,-14.12378 -0.4025,-26.44941 -0.76356,-27.3903 -0.61377,-1.59948 -0.74118,-1.59483 -1.95964,0.0715 -1.09208,1.49352 -2.20294,1.67646 -6.8577,1.12939 -5.39806,-0.63444 -9.49476,0.67355 -11.65364,3.72076 -0.3499,0.49387 -3.43254,1.10491 -6.85031,1.35787 -5.46297,0.40433 -6.91811,0.99531 -12.03808,4.88907 -7.68348,5.84334 -8.81474,9.24585 -9.44279,28.4013 -0.26148,7.975 -0.91536,17.65 -1.45308,21.5 -2.41673,17.30362 -3.19997,24.16594 -2.90117,25.4184 0.18291,0.76671 -2.26593,2.88551 -5.67839,4.91309 -5.34584,3.17633 -6.92673,3.60971 -14.5,3.97495 -4.675,0.22547 -10.38239,-0.098 -12.68308,-0.71877 -5.74283,-1.54958 -11.70916,-8.39817 -13.39473,-15.37544 -1.17192,-4.85107 -2.03939,-39.96781 -1.69736,-68.71223 0.16794,-14.11341 0.15269,-14.42945 -1.10291,-22.86624 -0.60295,-4.05143 -0.84262,-7.77666 -0.5326,-8.27829 0.31002,-0.50162 0.75106,-20.39217 0.98008,-44.20122 0.44901,-46.67999 0.73699,-49.43396 5.87335,-56.16808 3.72076,-4.87816 8.016,-5.73053 29.30725,-5.81585 16.37889,-0.0656 18.25,-0.24498 18.25,-1.74928 0,-0.92188 0.71154,-2.26668 1.5812,-2.98843 1.30719,-1.08487 1.95705,-1.07603 3.75,0.051 2.42754,1.5259 7.48484,2.79555 15.6688,3.93368 5.36531,0.74614 9.15135,1.92449 13.78192,4.28943 1.83096,0.93511 3.27526,0.80823 7.30828,-0.64202 3.16179,-1.13696 6.33751,-1.59468 8.5609,-1.23387 2.47007,0.40083 4.6315,-0.0143 7.17691,-1.37862 4.51601,-2.42043 12.85708,-2.56972 20.30716,-0.36344 7.49566,2.21977 15.67858,6.46553 17.97398,9.32589 l 1.93771,2.41465 2.7464,-2.63122 c 2.07202,-1.98512 3.3554,-2.47225 5.22657,-1.98383 3.37474,0.88089 5.22833,2.92153 4.57136,5.03269 -0.30004,0.96419 -0.10581,2.42807 0.43164,3.25307 0.8686,1.33333 1.08658,1.33333 1.96186,0 0.54158,-0.825 0.99847,-2.4 1.01531,-3.5 0.0424,-2.76825 0.80675,-3.73018 6.2637,-7.88271 4.55646,-3.46729 5.14377,-3.63414 13.5,-3.83517 9.58626,-0.23063 18.2282,1.13634 20.82882,3.29467 0.91994,0.76347 2.62545,2.78604 3.79004,4.49458 8.495,12.46283 10.12179,13.46973 18.61744,11.52322 3.76351,-0.86229 4.69641,-0.77062 5.7001,0.56008 1.04085,1.37997 1.28486,1.20987 1.83875,-1.28178 1.76182,-7.92542 3.75338,-12.26361 6.91489,-15.0626 2.83815,-2.51271 4.52544,-3.1082 10.22273,-3.60789 10.52885,-0.92345 14.71106,0.26952 20.32303,5.79711 4.37243,4.30668 5.06041,4.64719 7.64728,3.7849 1.8169,-0.60564 4.25518,-0.58898 6.75741,0.0462 3.56193,0.90412 4.0774,0.77625 5.71829,-1.41843 4.878,-6.52432 6.721,-7.64573 14.45634,-8.79622 15.36573,-2.28536 28.98794,2.08436 31.68065,10.16251 0.25116,0.75348 3.32522,1.24645 8.52943,1.36782 4.47521,0.10437 8.52964,0.43259 9.00985,0.72938 0.4802,0.29678 3.53444,-1.2286 6.78718,-3.38974 3.25274,-2.16114 6.29931,-3.94206 6.77017,-3.95761 0.47085,-0.0156 2.49585,-1.31839 4.5,-2.8952 5.3576,-4.21522 11.00068,-6.76448 16.6035,-7.50063 2.72778,-0.3584 5.40528,-1.09732 5.95,-1.64204 2.77422,-2.77422 20.63723,1.73735 33.75323,8.52489 3.70355,1.91659 7.67746,3.48471 8.83091,3.48471 1.15344,0 3.2735,1.17633 4.71123,2.61406 2.30214,2.30214 3.15406,2.54004 7.13958,1.99377 2.48904,-0.34116 5.55143,-1.29249 6.80531,-2.11406 2.77015,-1.81508 7.33503,-1.96565 7.39018,-0.24377 0.022,0.6875 0.67761,0.077 1.45687,-1.35673 2.05188,-3.7751 5.25863,-5.53295 14.30882,-7.84367 8.56017,-2.1856 13.20577,-2.56781 14.74427,-1.21306 0.5225,0.46009 3.3103,1.82166 6.19512,3.0257 5.20465,2.17226 5.27531,2.17457 9.15897,0.29819 2.15261,-1.04004 4.46951,-1.54756 5.14861,-1.12784 0.6792,0.41973 2.4076,0.39674 3.8411,-0.0511 4.4013,-1.37507 13.0115,-1.94369 13.6554,-0.90181 0.3507,0.56741 2.7793,-0.25163 5.7779,-1.94855 5.0355,-2.84966 5.3986,-2.90523 13.6729,-2.0922 4.675,0.45937 11.8991,0.86353 16.0537,0.89814 6.0856,0.0507 8.5878,0.57829 12.8752,2.71479 4.8188,2.40131 5.4093,2.49517 6.2497,0.99339 0.7085,-1.26595 1.3725,-1.4207 2.8053,-0.65385 1.3965,0.74737 2.2851,0.59676 3.47,-0.58813 2.0761,-2.07611 4.84,-7.4427 4.1754,-8.10728 -0.2849,-0.28498 0.3163,-2.83066 1.3361,-5.65707 4.8861,-13.54183 4.628,-40.58252 -0.555,-58.13893 -3.5553,-12.04318 -3.9136,-16.07807 -1.9093,-21.50094 0.9145,-2.47448 1.9166,-5.62406 2.2267,-6.99906 0.3102,-1.375 1.1733,-2.85986 1.9181,-3.29969 1.8334,-1.08273 1.7117,-6.2249 -0.217,-9.16844 -1.1965,-1.82609 -1.3157,-2.8749 -0.5,-4.39907 0.5891,-1.10072 1.0764,-3.2684 1.083,-4.81706 0.01,-1.54866 0.6639,-5.26603 1.4609,-8.26083 1.3998,-5.25966 1.3603,-5.65127 -1.1579,-11.5 -1.4338,-3.3302 -2.7011,-7.40491 -2.8161,-9.05491 -0.4524,-6.48775 -1.7431,-9.48801 -5.5689,-12.94439 -2.5262,-2.28221 -4.9338,-3.55561 -6.7227,-3.55561 -1.5328,0 -5.469,-0.73974 -8.7471,-1.64386 -3.2781,-0.90412 -9.3351,-1.75763 -13.4601,-1.89668 -7.6167,-0.25676 -17.0535,-0.98475 -27,-2.08288 -3.025,-0.33397 -7.075,-1.56154 -8.9999,-2.72793 -3.2268,-1.95517 -4.788,-2.10769 -20.00005,-1.95381 -9.07503,0.0918 -18.07505,0.24997 -20.00005,0.35149 -5.2925,0.27913 -18.69366,0.24841 -26,-0.0596 -7.45719,-0.31437 -21.40612,-0.28492 -28,0.0591 -4.22125,0.22025 -7.23564,0.23873 -27.5,0.16858 -10.10245,-0.035 -70.37149,-0.009 -85,0.0368 -6.05,0.0189 -17.3,-0.0994 -25,-0.26289 -7.7,-0.16347 -26.375,0.0437 -41.5,0.46035 -33.961,0.93557 -29.86443,0.96512 -46.5,-0.33542 -10.86662,-0.84953 -16.9905,-0.80071 -27.36159,0.21814 -8.87056,0.87144 -15.33431,1.01406 -19.23074,0.42432 -3.70086,-0.56013 -10.77131,-0.47347 -19.13841,0.23458 -15.46222,1.30847 -13.66856,1.27161 -25.76926,0.52963 -11.00621,-0.67487 -13.96348,-0.68964 -47.5,-0.23729 -80.2821,1.08286 -95.18834,1.48017 -97.26683,2.59254 -1.45345,0.77786 -7.52763,1.0716 -18.44999,0.89222 -15.14073,-0.24867 -21.60943,0.28114 -41.14967,3.3703 -5.78603,0.91473 -7.46108,1.65805 -10.64512,4.72391 -2.07824,2.0011 -4.45299,4.98836 -5.27721,6.63836 C 153.614,156.27481 149,170.25181 149,172.40642 c 0,0.9833 -0.66069,2.66133 -1.4682,3.72895 -0.8075,1.06762 -1.4825,4.04934 -1.5,6.62603 -0.0175,2.5767 -0.46341,5.82011 -0.99093,7.20759 -1.37466,3.61564 -1.52146,12.64258 -0.38392,23.60751 0.54206,5.225 0.7285,13.42866 0.41431,18.23035 -0.31419,4.80169 -0.21093,10.20169 0.22948,12 0.44041,1.79831 1.23742,5.29465 1.77114,7.76965 2.93002,13.58721 3.16077,16.19211 1.8602,21 -0.66951,2.475 -1.33043,7.65 -1.46871,11.5 -0.1629,4.53531 -0.9852,8.58444 -2.33543,11.5 -2.63106,5.68122 -2.64167,8.07268 -0.0583,13.13649 2.39073,4.68622 2.62987,7.73264 1.05719,13.46786 -0.6869,2.505 -1.14417,13.80546 -1.17346,29 -0.0264,13.69261 -0.0851,29.39565 -0.13052,34.89565 -0.23306,28.23839 -0.14197,35.90849 0.5463,46 0.5303,7.7752 1.37618,12.40747 2.88536,15.80097 1.95048,4.38579 2.03568,5.38082 0.9853,11.50616 -1.30453,7.60745 -3.55429,12.75563 -6.19086,14.16668 -2.54608,1.36262 -3.07695,4.42891 -1.33518,7.71203 3.07249,5.79149 4.35029,10.53206 3.2094,11.90675 -1.04162,1.25507 -0.54515,3.83105 2.10219,10.90741 0.41152,1.1 1.18708,4.925 1.72345,8.5 0.77327,5.15392 0.65848,7.49368 -0.5543,11.29833 -1.31967,4.13998 -1.34705,5.64924 -0.19949,11 0.73152,3.41092 1.25869,8.00167 1.1715,10.20167 -0.99651,25.14226 -1.16189,53.5 -0.31201,53.5 1.77003,0 2.29101,3.78229 1.07845,7.82945 -0.74307,2.48016 -0.83604,4.52131 -0.25334,5.56252 0.55746,0.99613 0.5639,4.82521 0.0163,9.70962 -0.76097,6.78807 -0.6259,8.79331 0.85314,12.66613 1.23006,3.22086 1.83451,8.07098 2.01479,16.16677 0.2744,12.3222 0.94403,16.65911 2.94377,19.06551 0.68558,0.825 1.96976,4.40351 2.85374,7.95225 1.54032,6.18366 1.52739,6.5375 -0.31047,8.5 -1.05473,1.12626 -2.32207,3.17275 -2.81631,4.54775 -1.26687,3.52452 -1.50429,10.96362 -0.39391,12.34217 0.51294,0.63681 2.381,4.65828 4.15125,8.9366 2.41913,5.84652 3.93408,8.14874 6.09886,9.26819 1.62406,0.83984 3.1046,2.57181 3.3947,3.97123 0.28297,1.36499 0.72547,3.51678 0.98333,4.78174 0.87249,4.28009 6.65273,6.11972 18.53116,5.89774 5.775,-0.10792 14.1,0.14096 18.5,0.55306 4.4,0.4121 10.7,0.67102 14,0.57539 3.3,-0.0956 15.9,-0.46661 28,-0.8244 z M 639.07836,455.43007 c 0.63331,-1.18333 0.92475,-4.13362 0.64954,-6.57526 -0.3378,-2.997 -0.098,-4.58277 0.74157,-4.90497 2.01555,-0.77344 1.18975,-5.64864 -1.48607,-8.77318 -5.62541,-6.56874 -12.88975,-13.60016 -14.05068,-13.60016 -1.88154,0 -13.93272,6.96197 -13.93272,8.04894 0,0.52308 0.45,1.00731 1,1.07606 0.55,0.0688 1.45,0.2375 2,0.375 0.55,0.1375 1.3375,0.32056 1.75,0.4068 0.4125,0.0863 0.0695,0.705 -0.7622,1.375 -1.97977,1.59487 -4.1749,6.60645 -3.4251,7.81966 0.32346,0.52337 1.34168,0.82715 2.26271,0.67506 1.08453,-0.17909 1.78729,0.51706 1.99443,1.97567 0.17591,1.23871 1.18694,2.71625 2.24673,3.28344 1.05979,0.56718 2.83751,2.8162 3.95049,4.99781 1.76242,3.45464 2.46506,3.96656 5.44425,3.96656 1.88136,0 3.69877,0.45 4.03869,1 1.17732,1.90495 6.36534,1.12013 7.57836,-1.14643 z M 345.64487,405.63399 c 6.6346,-3.20549 9.97495,-6.98383 10.67017,-12.06926 1.035,-7.57084 0.0885,-34.79709 -1.26648,-36.42971 -0.66614,-0.80265 -3.70143,-2.86479 -6.74508,-4.58252 l -5.53392,-3.12315 -4.63478,1.94564 c -2.54913,1.0701 -5.86321,2.23451 -7.36461,2.58757 -1.50141,0.35306 -4.05875,1.94098 -5.68298,3.52871 -1.79155,1.75129 -4.55519,3.15745 -7.02606,3.5749 -3.1428,0.53097 -4.84734,1.63837 -7.46407,4.84922 -4.30412,5.28134 -6.45898,11.91764 -4.5979,14.1601 0.71319,0.85934 1.36666,3.51601 1.45215,5.90369 0.11111,3.10345 0.9243,5.255 2.85206,7.54601 1.48315,1.76262 2.69663,3.51552 2.69663,3.89534 0,0.37982 2.8125,1.72288 6.25,2.98457 3.4375,1.2617 8.275,3.36416 10.75,4.67215 5.53926,2.9274 10.38153,3.09971 15.64487,0.55674 z m 359.71113,-4.5551 c 1.2571,-0.82368 3.79419,-1.61994 5.63798,-1.76946 1.84378,-0.14953 3.46566,-0.83685 3.60418,-1.5274 0.13851,-0.69054 0.0315,-0.81956 -0.23777,-0.28671 -0.60821,1.20352 -2.34374,0.65125 -9.50037,-3.02312 -3.10199,-1.59264 -6.10653,-2.8957 -6.67676,-2.8957 -0.57023,0 -1.72853,1.38666 -2.57401,3.08146 -1.4642,2.93506 -1.42233,3.19637 0.8813,5.5 2.77423,2.77423 5.59048,3.06678 8.86545,0.92093 z m 351.0383,-240.9172 c -0.4349,-1.13332 0.3008,-1.30165 3.6975,-0.84606 3.8769,0.52001 4.1735,0.40556 3.4608,-1.33519 -0.4287,-1.04717 -1.0234,-2.80394 -1.3215,-3.90394 -0.2981,-1.1 -1.1471,-2.88763 -1.8866,-3.97251 -0.7395,-1.08487 -1.3894,-3.10987 -1.4442,-4.5 l -0.1,-2.52749 -0.8006,2.5 c -0.6011,1.87684 -0.8255,2.03327 -0.9003,0.62756 -0.077,-1.44978 -0.4026,-1.62104 -1.4417,-0.75868 -0.7381,0.61257 -1.6272,0.82855 -1.9758,0.47994 -0.3486,-0.3486 -1.3123,-0.0708 -2.1415,0.61737 -1.262,1.04737 -1.6729,0.81643 -2.5223,-1.41767 -0.558,-1.46788 -1.4655,-2.39023 -2.0165,-2.04968 -1.4532,0.8981 -1.2284,3.81947 0.4663,6.06003 0.8075,1.06762 1.4825,2.72044 1.5,3.67294 0.017,0.95249 1.5693,3.31499 3.4484,5.25 3.6428,3.75104 4.8562,4.39269 3.9777,2.10338 z M 401.30287,110.01377 c 0.81018,-0.31089 2.06007,-2.67396 2.77755,-5.25126 1.50159,-5.393954 3.31488,-7.632034 5.50312,-6.792324 0.84269,0.32336 3.35966,-0.34439 5.59328,-1.4839 4.65644,-2.37553 4.01907,-4.29017 -1.40071,-4.20772 -1.80186,0.0274 -15.96693,0.21898 -31.47794,0.42571 -30.37935,0.4049 -33.36216,0.91876 -28.48231,4.90682 1.99508,1.63048 3.38927,1.80986 10.06539,1.29504 9.64013,-0.74339 12.11875,0.30969 12.11875,5.148844 0,4.51235 3.00143,6.70483 8.06929,5.89445 2.39915,-0.38364 3.94396,-0.16051 4.43947,0.64124 0.73925,1.19614 9.16354,0.81628 12.79411,-0.5769 z M 447,107.05818 c 4.08523,-1.0902 4.50552,-1.48677 4.55991,-4.3025 0.033,-1.70589 0.83181,-3.954544 1.77523,-4.997024 1.57419,-1.73945 1.58265,-2.0055 0.10279,-3.23367 -1.75276,-1.45466 -14.32797,-1.70143 -23.36511,-0.45851 -4.50476,0.61957 -5.07282,0.96824 -5.07282,3.11365 0,1.32877 0.9,3.186554 2,4.128404 1.2293,1.05256 2,2.94994 2,4.92379 0,4.68445 3.0215,4.82308 18,0.82586 z M 460.75047,94.326496 C 460.12044,92.434306 457,92.165296 457,94.003176 c 0,0.92763 0.855,1.57332 2.08333,1.57332 1.22198,0 1.91126,-0.51682 1.66714,-1.25 z"
+         id="path3123"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#524a4e"
+         d="m -27.21955,966.0236 c -0.79252,-0.7925 1.97213,-9.5068 3.6086,-11.3745 0.75786,-0.8649 2.35378,-3.3726 3.54649,-5.5726 1.1927,-2.2 3.29513,-5.8 4.67205,-8 2.50145,-3.99673 2.50319,-4.01723 2.12604,-25.07086 l -0.37746,-21.07085 -3.18162,-6.42915 c -3.261,-6.58952 -5.60527,-10.63827 -9.91505,-17.12415 -3.05683,-4.60028 -3.93572,-13.98814 -4.84367,-51.73767 -0.80255,-33.36736 0.34445,-45.42193 5.24972,-55.17255 1.8276,-3.63288 4.64261,-8.26586 6.25558,-10.29552 4.08482,-5.14008 4.98229,-10.66504 4.72684,-29.09925 -0.21606,-15.59098 -0.79947,-19.30415 -4.79223,-30.50055 -0.49045,-1.3753 -3.07911,-4.87981 -5.75257,-7.78781 -6.61916,-7.19984 -8.57831,-14.07221 -7.75739,-27.21164 0.32645,-5.225 0.13786,-15.8 -0.41908,-23.5 -1.21894,-16.85257 -1.15017,-31.65262 0.1707,-36.73304 0.53381,-2.05318 0.98475,-7.55735 1.0021,-12.2315 l 0.0315,-8.49846 5.54621,-7.0883 c 8.98594,-11.48442 9.65864,-14.07426 9.46727,-36.4487 -0.19349,-22.62396 -0.74416,-24.79599 -9.12034,-35.97336 -7.30081,-9.7424 -7.67332,-11.37818 -8.54566,-37.52664 -0.35779,-10.725 -0.81811,-24.225 -1.02293,-30 -0.20482,-5.775 -0.0993,-18.51318 0.23454,-28.30706 l 0.60695,-17.80706 4.12195,-4.69294 c 6.40938,-7.29725 9.27373,-12.25847 10.21498,-17.69294 1.01593,-5.86573 1.11045,-40.84429 0.12031,-44.52444 -0.37356,-1.38844 -3.16936,-5.64934 -6.2129,-9.46868 -6.94261,-8.71228 -10.67791,-18.00152 -10.51377,-26.14645 0.065,-3.22324 -0.0899,-11.93543 -0.34411,-19.36043 -0.90714,-26.49587 -0.81169,-49.55385 0.22148,-53.5 0.576,-2.2 1.058,-6.15195 1.07112,-8.78212 0.0291,-5.83105 1.8674,-10.45436 6.36487,-16.00753 1.87546,-2.31569 4.20845,-5.78099 5.18442,-7.70067 5.04739,-9.92797 4.55646,-48.4111 -0.74561,-58.44772 -0.59911,-1.13408 -2.79456,-4.00931 -4.87879,-6.38941 -2.23132,-2.54806 -4.73761,-7.07109 -6.09527,-11 C -39.4718,95.158106 -39.5,94.513886 -39.5,49.076496 c 0,-50.616878 -0.0679,-49.982607 6.24022,-58.246758 6.51254,-8.531901 8.46073,-14.227688 8.93304,-26.116947 0.23239,-5.849962 0.63455,-11.648795 0.89369,-12.886295 l 0.47115,-2.25 522.12769,0 522.12771,0 -0.622,7.358083 c -0.3421,4.046946 -0.2956,7.684446 0.1033,8.083334 0.3988,0.398887 0.7252,1.05897 0.7252,1.466851 0,1.509603 6.0513,7.091732 7.6877,7.091732 0.9319,0 1.9764,0.45643 2.3211,1.01429 1.2288,1.988169 8.4717,4.98571 12.047,4.98571 1.9995,0 4.8299,0.839735 6.2898,1.866077 1.4599,1.026343 4.0044,2.124074 5.6544,2.439402 1.65,0.315329 4.259,0.882168 5.7978,1.259643 2.115,0.518808 3.1323,0.228894 4.1683,-1.18783 0.7537,-1.030781 1.7045,-1.540022 2.1129,-1.131646 0.4084,0.408376 1.234,-0.267331 1.8348,-1.501572 0.6007,-1.234241 3.2284,-3.265253 5.8392,-4.513361 3.534,-1.689402 4.7561,-2.839315 4.7824,-4.5 0.02,-1.226892 0.6786,-3.355713 1.4646,-4.730713 2.0765,-3.632455 1.8197,-5 -0.9387,-5 -2.1156,0 -2.5262,-0.583163 -3.0988,-4.401238 -0.363,-2.420681 -0.3602,-5.345681 0.01,-6.5 l 0.6623,-2.098762 56.4326,0 56.4326,0 0,508.500004 0,508.5 -608.83333,0 c -334.85834,0 -609.08213,-0.2488 -609.38622,-0.5529 z M 1082.5167,904.15752 c 2.0773,-1.36109 2.3754,-2.32482 2.3502,-7.59688 -0.025,-5.1993 -0.4191,-6.46524 -2.8378,-9.11342 -2.1946,-2.40283 -3.3035,-2.91842 -5.0703,-2.35765 -1.8184,0.57713 -2.1405,0.40283 -1.6445,-0.88978 0.7581,-1.97557 -3.0185,-4.07034 -8.9841,-4.98321 -3.3082,-0.50623 -5.1964,-0.12246 -9.1378,1.85717 -3.9971,2.00765 -5.8485,2.37456 -9.4742,1.8776 -4.8718,-0.66775 -4.6243,-0.91201 -6.2071,6.12515 -0.3711,1.65 -0.5254,3.04334 -0.3429,3.09631 0.1825,0.053 -0.3262,0.88916 -1.1305,1.85821 -1.3009,1.56759 -1.2458,1.92019 0.5,3.19712 1.0793,0.78937 2.9219,1.67618 4.0947,1.97068 1.1728,0.2945 2.6048,1.51246 3.1823,2.70657 0.5775,1.19411 1.0804,1.60861 1.1176,0.92111 0.1079,-1.99242 1.747,-1.47044 5.3691,1.7098 6.4507,5.66377 19.2555,5.49187 28.2153,-0.37878 z M 118.56736,862.06097 c 2.23705,-0.0774 4.62218,-0.48358 5.30028,-0.90266 0.67809,-0.41909 2.8279,-0.005 4.77735,0.91997 2.17994,1.03445 4.37416,1.40428 5.69973,0.96067 1.1854,-0.3967 9.58028,-1.06426 18.65528,-1.48345 9.075,-0.41919 18.75,-1.29102 21.5,-1.9374 7.36058,-1.73007 12.17155,-1.4831 22,1.12937 3.65046,0.97031 12.42245,1.292 32.5,1.19185 42.37834,-0.21139 107.92862,-1.3897 113.5,-2.04022 2.75,-0.3211 6.575,-0.55008 8.5,-0.50884 17.76241,0.38047 40.43843,0.0903 60,-0.76786 12.925,-0.56699 37.9,-1.02462 55.5,-1.01695 17.6,0.008 37.625,-0.41955 44.5,-0.94938 6.875,-0.52983 23.525,-1.00382 37,-1.05331 13.475,-0.0495 31.7,-0.30722 40.5,-0.57273 63.55926,-1.91768 76.64839,-2.4272 77.6093,-3.02108 0.50203,-0.31027 9.57032,-0.74037 20.15174,-0.95577 25.75437,-0.52426 41.25162,-1.34923 43.98596,-2.3415 1.23915,-0.44967 5.30927,-0.71496 9.0447,-0.58952 5.17999,0.17395 7.17955,-0.16036 8.42609,-1.40879 0.89891,-0.90028 2.34264,-1.74605 3.2083,-1.8795 6.40101,-0.98677 8.82952,-1.50256 10.57391,-2.24578 1.1,-0.46867 3.595,-1.06971 5.54444,-1.33563 2.96726,-0.40477 3.56806,-0.16997 3.68946,1.44188 0.08,1.05896 -0.1867,1.72035 -0.5922,1.46976 -0.4054,-0.2506 -1.39071,-0.0422 -2.18945,0.46307 -1.2112,0.76622 -1.16178,0.94199 0.29775,1.05902 2.615,0.20966 3.1369,0.34904 4.4635,1.1921 1.1664,0.74119 4.5965,-1.84506 5.4115,-4.08019 0.2063,-0.56563 3.4401,-1.35226 7.1864,-1.74808 6.4021,-0.67642 6.8448,-0.59208 7.3667,1.4034 0.7253,2.77367 4.3219,2.87609 4.3219,0.12308 0,-2.14283 0.5222,-2.32413 6.1276,-2.12741 2.1397,0.0751 4.1382,-0.48793 4.8724,-1.37264 0.6847,-0.82497 2.0332,-1.49995 2.9968,-1.49995 0.9635,0 3.3784,-1.48993 5.3665,-3.31096 2.793,-2.55824 3.3445,-3.58129 2.4257,-4.5 -0.6539,-0.65397 -0.7615,-1.19593 -0.239,-1.20435 0.5225,-0.008 0.275,-0.45153 -0.55,-0.98469 -1.3333,-0.86167 -1.3333,-0.97278 0,-1 0.825,-0.0168 2.1461,-0.43944 2.9357,-0.9391 1.1898,-0.7529 1.2117,-1.17839 0.1276,-2.48468 -1.5883,-1.91372 -5.6966,-1.98542 -8.9975,-0.15702 -1.7548,0.972 -3.2066,1.07907 -5.2016,0.38362 -1.8485,-0.64441 -4.5888,-0.58658 -8.2534,0.17418 -4.5155,0.93742 -5.99,0.87826 -8.3352,-0.33446 -1.8324,-0.94758 -7.1183,-1.65066 -14.8124,-1.97019 -6.57974,-0.27326 -12.6382,-0.7616 -13.4632,-1.08519 -2.69053,-1.05533 -45.86041,-1.26447 -74,-0.35851 -43.09607,1.3875 -64.28723,1.91512 -67,1.66817 -2.39334,-0.21788 -12.47956,-0.2721 -33,-0.17741 -5.225,0.0241 -13.775,0.0152 -19,-0.0198 -5.225,-0.035 -14,0.38545 -19.5,0.9343 -5.5,0.54884 -12.7,0.74323 -16,0.43198 -3.3,-0.31126 -17.25,-0.21969 -31,0.20347 -13.75,0.42317 -33.0514,0.75595 -42.89201,0.73952 -9.84061,-0.0164 -21.76561,0.49475 -26.5,1.13594 -4.73439,0.64119 -9.50799,1.12653 -10.60799,1.07853 -17.79131,-0.77634 -45.37704,-0.28659 -61.01312,1.08322 -13.44855,1.17817 -20.67918,1.3945 -24.70578,0.73915 -3.72756,-0.60668 -9.07364,-0.54311 -15.48688,0.18414 -5.38682,0.61086 -11.14422,1.08205 -12.79422,1.04709 -1.65,-0.0349 -6.6,0.33601 -11,0.82436 -4.4,0.48836 -20.13012,1.12293 -34.95583,1.41017 -14.82571,0.28724 -28.73486,1.00129 -30.90923,1.58679 -2.17437,0.5855 -5.55148,0.76474 -7.5047,0.39831 -1.95321,-0.36642 -6.94406,-0.1715 -11.09077,0.43317 -4.14671,0.60466 -20.13947,1.56431 -35.53947,2.13254 -41.9174,1.54667 -47.58315,2.17013 -51.68699,5.68764 -0.92784,0.79528 -2.22752,1.11189 -2.88817,0.70359 -2.49776,-1.5437 -9.77271,-1.4829 -19.67484,0.16443 l -10.25,1.70521 0.0151,3.5884 c 0.0234,5.56802 2.33942,11.04087 5.32871,12.59174 3.92367,2.03562 10.80106,3.40614 13.65623,2.7214 1.375,-0.32976 4.33031,-0.66288 6.56736,-0.74026 z M 258,788.6139 c 9.075,-0.55131 26.4,-0.89872 38.5,-0.77203 12.1,0.12669 37.525,-0.35383 56.5,-1.06782 18.975,-0.71399 44.23891,-1.44394 56.14203,-1.62211 11.90312,-0.17817 22.02812,-0.56056 22.5,-0.84976 1.18543,-0.72649 63.51609,-2.51905 113.85797,-3.27442 34.38018,-0.51586 65.66381,-1.45355 80,-2.39789 8.25,-0.54343 19.725,-0.90427 25.5,-0.80186 6.85725,0.1216 11.27699,-0.24694 12.73962,-1.06229 1.39363,-0.77688 6.49311,-1.27593 13.5,-1.32116 6.19321,-0.04 13.96038,-0.67617 17.26038,-1.41376 9.82913,-2.19693 31.00915,-1.62471 38.27159,1.03398 1.21849,0.44608 9.11752,-2.21516 14.10241,-4.7512 2.5794,-1.31226 2.82885,-1.35946 8.376,-1.58477 4.70229,-0.19099 4.80633,-1.68411 0.25,-3.58786 -3.67641,-1.5361 -4.06577,-2.71453 -3.7633,-11.3899 0.11466,-3.28872 0.0753,-3.31875 -3.56038,-2.71853 -6.83468,1.12832 -28.58428,0.91624 -32.92443,-0.32104 -2.9759,-0.84837 -8.66596,-1.01746 -19,-0.56461 -8.11354,0.35554 -21.95189,0.81542 -30.75189,1.02197 -8.8,0.20654 -17.19608,0.58823 -18.65796,0.84819 -1.46188,0.25996 -3.93688,0.11506 -5.5,-0.322 C 639.77892,751.25796 627.025,751.39 613,751.98843 c -14.025,0.59844 -32.025,0.82029 -40,0.493 -7.975,-0.32729 -20.125,-0.20002 -27,0.28282 -11.03706,0.77514 -33.43396,0.98786 -93.48105,0.88787 -9.33958,-0.0155 -18.62282,0.4138 -20.62942,0.95413 -2.0066,0.54032 -6.96513,0.92471 -11.01895,0.8542 -9.68327,-0.16843 -44.12969,0.90853 -49.87058,1.55919 -2.475,0.28051 -6.12477,0.1321 -8.1106,-0.32981 -1.98582,-0.4619 -8.06082,-0.44202 -13.5,0.0442 -18.02226,1.61102 -23.57262,1.81441 -64.3894,2.35945 -22.275,0.29745 -45.9,0.95654 -52.5,1.46464 -6.6,0.5081 -21.30944,0.9012 -32.68765,0.87355 -11.37821,-0.0276 -21.27734,0.31417 -21.99806,0.7596 -0.72072,0.44543 -6.93627,0.87254 -13.81234,0.94914 -13.79384,0.15366 -22.53364,1.85081 -28.81232,5.59496 l -3.98671,2.37739 2.89854,2.89853 c 3.32424,3.32424 3.4579,3.8561 1.39854,5.56521 -3.67245,3.04786 -0.22311,6.47383 7.5,7.44917 3.025,0.38203 7.3,0.90625 9.5,1.16495 7.06809,0.83114 53.43837,1.91045 71.5,1.66422 9.625,-0.13121 24.925,-0.68964 34,-1.24094 z m -22.94513,-52.06676 c 1.0681,-0.57164 3.79452,-0.47713 7.27078,0.25202 4.30975,0.90398 6.98156,0.88738 11.86811,-0.0738 3.9918,-0.78515 14.74741,-1.21261 29.30624,-1.16472 12.65,0.0416 25.925,0.0303 29.5,-0.0251 3.575,-0.0554 14.825,-0.007 25,0.10769 15.16742,0.17087 42.2759,-0.62276 54,-1.58093 1.375,-0.11237 4.73004,0.18824 7.45564,0.66803 3.05423,0.53763 9.00134,0.45279 15.5,-0.22114 9.81898,-1.01826 30.33161,-1.39709 125.68628,-2.32117 20.42805,-0.19797 37.66578,-0.68372 38.30607,-1.07943 1.79066,-1.1067 55.08826,-1.42984 68.05201,-0.41261 7.742,0.6075 12.64374,0.55725 15,-0.15378 3.77199,-1.13823 43.98144,-2.94023 74.00811,-3.31669 10.17946,-0.12762 19.00077,-0.53653 19.60292,-0.90867 0.60215,-0.37215 3.8684,-0.22997 7.25833,0.31596 4.63414,0.74631 8.41404,0.63034 15.23344,-0.46736 4.9884,-0.80298 9.7302,-1.20657 10.5373,-0.89686 2.1233,0.81477 9.1024,-2.5995 9.6582,-4.72489 0.392,-1.49884 1.1822,-1.71249 4.6256,-1.25064 2.9597,0.39699 5.1255,0.0332 7.5387,-1.26641 2.5476,-1.37194 3.9344,-1.57869 5.601,-0.835 1.5117,0.67449 4.1181,0.59628 8.2067,-0.24627 10.6683,-2.1985 18.0397,-5.51668 20.9251,-9.41932 1.1994,-1.62229 2.9561,-2.94961 3.9038,-2.94961 2.2032,0 6.73,-5.34894 7.4703,-8.82707 0.3129,-1.47011 1.0363,-3.79793 1.6075,-5.17293 2.6492,-6.37671 3.5103,-11.83827 2.3156,-14.68553 -0.6496,-1.54796 -1.5012,-6.77089 -1.8924,-11.60651 -0.634,-7.83622 -0.4903,-9.14964 1.3216,-12.08139 2.6089,-4.22136 2.5064,-13.4335 -0.1718,-15.43327 -2.3638,-1.76501 -2.2027,-4.65749 0.428,-7.683 4.2066,-4.83802 4.8814,-8.86064 4.1952,-25.0103 -0.3505,-8.25 -0.9868,-15.45 -1.414,-16 -0.8934,-1.15023 -0.4962,-13.65635 0.5639,-17.75711 0.6046,-2.3388 0.1639,-3.25988 -2.9052,-6.071 -2.7615,-2.52945 -3.6179,-4.09766 -3.6179,-6.62486 0,-3.56076 -3.1221,-9.45634 -5.8019,-10.95605 -1.0336,-0.57845 -2.371,-0.53363 -3.5931,0.12042 -1.5145,0.81054 -2.2265,0.65915 -3.2072,-0.68199 -1.7761,-2.42899 -0.7398,-4.29538 2.8189,-5.077 2.2509,-0.49439 2.6874,-0.89921 1.6664,-1.5458 -0.7607,-0.48179 -2.5081,-0.88977 -3.8831,-0.90661 -1.9459,-0.0238 -2.1718,-0.23814 -1.0194,-0.96686 1.3683,-0.8652 -7.3138,-0.54661 -12.2988,0.45131 -2.6409,0.52868 -7.6818,-1.4552 -7.6818,-3.02326 0,-0.73873 -0.5195,-1.66424 -1.1545,-2.05668 -0.6705,-0.41437 -0.8847,-0.27699 -0.511,0.32767 0.3539,0.57267 -0.046,1.61353 -0.889,2.31304 -1.6885,1.40133 -2.8736,1.17701 -18.9455,-3.58607 -8.9699,-2.65832 -13.313,-3.01787 -27.3182,-2.26158 -4.7448,0.25622 -7.93107,-0.0341 -9.06104,-0.82554 -1.41661,-0.99223 -2.57371,-0.84181 -6.18179,0.80359 -3.70373,1.68902 -5.77128,1.93542 -12.48268,1.48759 -7.09261,-0.47327 -8.8071,-0.9988 -14.5,-4.44458 l -6.45629,-3.90784 -11.85818,0.30048 c -9.4638,0.2398 -12.3671,0.66274 -14.37863,2.0946 -4.63965,3.30263 -8.7411,5.19766 -11.35426,5.2461 -1.42509,0.0264 -4.80009,0.72827 -7.5,1.55968 -7.12245,2.19327 -22.18378,3.03428 -28.02033,1.56462 -10.63116,-2.67696 -22.15602,-9.2028 -31.4366,-17.80067 l -3.548,-3.287 -3.39628,2.5057 c -2.05676,1.51743 -4.79868,2.52816 -6.952,2.56265 -3.04951,0.0488 -4.08127,0.74732 -7.24733,4.9063 -4.70139,6.17582 -11.7307,9.10506 -23.5158,9.79948 -7.09061,0.4178 -8.79151,0.18307 -12.5,-1.725 C 558.4318,527.3415 553,521.72598 553,518.42277 c 0,-1.5113 -0.48729,-5.01998 -1.08286,-7.79705 -0.85178,-3.97168 -1.49951,-5.04922 -3.03519,-5.04922 -1.07377,0 -3.05821,-0.72461 -4.40985,-1.61024 -3.20786,-2.10187 -7.29841,-1.12573 -7.85928,1.87547 -0.2297,1.22912 -0.86125,5.74376 -1.40345,10.03252 -1.53951,12.1774 -5.13788,14.88407 -19.7876,14.88407 -7.86357,0 -9.96412,-0.35867 -13.39563,-2.28729 -4.34234,-2.44053 -8.57071,-8.22317 -11.98798,-16.39453 -1.15006,-2.75 -2.73016,-6.35 -3.51134,-8 -0.78119,-1.65 -2.59642,-6.23053 -4.03386,-10.17896 l -2.61352,-7.17896 -3.68972,2.51148 c -2.93735,1.99937 -4.45438,2.39029 -7.43972,1.91714 l -3.75,-0.59434 -0.18289,4.76182 c -0.10059,2.619 -0.0869,6.08729 0.0303,7.7073 0.60742,8.39172 -4.09262,21.11428 -9.25471,25.0516 -3.30807,2.52319 -4.25381,2.72248 -12.54908,2.64439 -9.25921,-0.0872 -14.41779,-1.47415 -16.98199,-4.56598 -1.68292,-2.02921 -4.39659,-18.84099 -4.20897,-26.07549 0.37071,-14.29411 -0.22223,-20.53739 -1.58683,-16.70826 -0.37621,1.05565 -0.74548,1.05565 -2.02046,0 -0.85806,-0.71046 -2.5018,-1.34738 -3.65275,-1.41538 -1.15095,-0.068 -2.88014,-0.1805 -3.84264,-0.25 -0.9625,-0.0695 -1.78046,-0.91386 -1.81768,-1.87636 -0.0548,-1.41779 -0.269,-1.33336 -1.12818,0.44479 -1.32573,2.74371 -0.21968,6.57636 1.23434,4.27718 0.73167,-1.15695 0.93417,-0.97781 0.94621,0.83705 0.008,1.26996 -0.3837,2.06241 -0.87138,1.76101 -0.48768,-0.30141 -1.44879,0.12927 -2.13579,0.95706 -1.40557,1.6936 -0.60195,12.24848 1.05902,13.90945 0.5299,0.5299 0.95657,1.66096 0.94815,2.51346 -0.0135,1.3658 -0.13052,1.37174 -0.98469,0.05 -0.70322,-1.08815 -0.97358,-0.23159 -0.98469,3.11973 -0.0168,5.0629 -2.96463,15.34709 -5.51459,19.23883 -2.49858,3.81331 -7.14037,5.4101 -17.61304,6.05892 -13.08076,0.81041 -17.52326,-1.12252 -22.60224,-9.83421 -0.66802,-1.1458 -1.23312,-5.45827 -1.2558,-9.58327 -0.0227,-4.125 -0.48908,-10.2 -1.03646,-13.5 -0.87366,-5.26705 -1.44199,-32.67013 -2.38508,-115 -0.39029,-34.07152 0.48492,-29.94998 -7.11438,-33.50294 -5.98804,-2.79963 -6.72482,-2.92916 -9.25,-1.62623 -4.27047,2.20346 -15.96075,4.85376 -18.23113,4.13317 -3.14411,-0.99791 -9.21376,1.42722 -12.22195,4.88327 -1.49015,1.712 -2.72765,3.62379 -2.75,4.24842 -0.0224,0.62463 -0.71287,2.42463 -1.53448,4 -1.89419,3.63195 -1.97668,15.48304 -0.15001,21.55259 2.49813,8.30066 7.31917,11.77799 19.77846,14.26583 3.35893,0.6707 11.52466,8.33505 12.33257,11.57535 0.33879,1.3588 0.48477,7.16004 0.3244,12.89166 -0.28012,10.01169 -0.39377,10.48315 -2.89255,12 -1.43053,0.86838 -3.68053,2.34171 -5,3.27407 -1.31946,0.93235 -5.43311,2.17794 -9.14143,2.76797 -8.59893,1.36819 -11.55493,2.74424 -13.34936,6.21429 -2.03143,3.92836 -2.33547,7.95059 -2.8212,37.32255 -0.37885,22.90893 -0.6809,26.79941 -2.54068,32.7241 -2.80115,8.92359 -7.16024,12.1853 -17.69704,13.24189 -21.35267,2.14117 -29.26094,-7.33111 -28.35773,-33.96599 0.39699,-11.7068 -0.2033,-56.75627 -0.98606,-74 -0.14537,-3.20241 -0.41166,-30.99787 -0.41196,-43 -1.4e-4,-6.05 0.20374,-21.125 0.45308,-33.5 0.41917,-20.80381 0.62298,-22.84421 2.70344,-27.06591 1.55951,-3.16459 3.55443,-5.30089 6.5,-6.96069 4.21536,-2.37532 4.5141,-2.39663 36.74991,-2.62129 32.71917,-0.22802 37.54475,0.16533 42.79994,3.48882 1.95077,1.23371 3.11432,1.25917 7.66408,0.1677 2.95027,-0.70776 6.23462,-1.05919 7.29856,-0.78097 1.06393,0.27823 3.67852,-0.54674 5.81019,-1.83326 5.91592,-3.5704 10.92898,-3.91643 20.56242,-1.41932 8.4751,2.19685 13.89036,5.33562 15.99716,9.27222 1.79824,3.36005 4.86765,16.56319 4.86765,20.93835 0,2.91072 0.32476,3.72219 1.25,3.12337 0.6875,-0.44496 3.49251,-0.80902 6.23337,-0.80902 4.90728,0 5.0031,-0.0597 6.27607,-3.90837 0.71099,-2.1496 1.741,-7.0996 2.28891,-11 1.34449,-9.57086 1.36084,-9.60387 6.73491,-13.59163 l 4.71674,-3.5 11.5,0.0434 c 7.97707,0.0301 12.40357,0.48964 14.44953,1.5 4.35133,2.14883 10.90467,11.2808 15.13806,21.09462 3.66072,8.48626 3.78054,8.62976 6.8193,8.1673 1.70121,-0.2589 3.52061,-0.88351 4.04311,-1.38803 0.5225,-0.50452 2.12225,-0.91731 3.555,-0.91731 2.47121,0 2.67149,-0.39803 3.89967,-7.75 1.46452,-8.76671 2.89789,-12.45626 6.48448,-16.69121 3.35802,-3.96507 13.5482,-5.86196 21.11085,-3.92976 8.26298,2.11113 14.46525,11.11254 14.51365,21.06379 0.0202,4.15636 1.07826,7.36841 2.19898,6.67577 2.02122,-1.24919 9.78737,-0.97414 9.78737,0.34663 0,0.70663 0.4096,1.28478 0.91023,1.28478 0.50063,0 1.23533,-3.90276 1.63267,-8.67281 0.74304,-8.92006 3.03221,-15.78176 6.17081,-18.49671 2.29329,-1.98375 14.63274,-5.02475 17.55198,-4.3256 1.22887,0.29431 4.0656,0.70053 6.30383,0.90272 5.80502,0.52438 12.21225,4.10821 14.6099,8.17193 2.63261,4.46193 4.98477,5.66789 9.42881,4.83419 2.08999,-0.39209 5.18658,-0.1415 7.43948,0.60203 l 3.85929,1.27367 4.68868,-4.62245 c 2.57877,-2.54234 5.6372,-4.91755 6.7965,-5.27822 1.1593,-0.36068 3.69092,-1.90083 5.62582,-3.42255 6.17324,-4.855 13.58193,-7.47526 27.01864,-9.55577 2.11568,-0.32759 5.32992,0.11155 8,1.09298 2.45485,0.90233 7.35708,2.55382 10.89385,3.66999 8.1414,2.56933 13.03815,5.66049 17.23006,10.87676 4.58705,5.70797 8.01327,6.92747 17.53658,6.24184 9.22815,-0.66439 11.05505,-1.43964 11.94961,-5.07086 1.522,-6.17816 4.85387,-8.85032 13.84803,-11.10612 11.10251,-2.78459 12.16742,-2.71324 20.17559,1.35169 6.72128,3.41171 6.99624,3.46072 17.32964,3.08881 5.775,-0.20785 11.175,-0.41842 12,-0.46794 0.825,-0.0495 2.8075,-1.21447 4.4055,-2.5888 1.5981,-1.37433 4.159,-2.49878 5.691,-2.49878 1.532,0 3.0986,-0.5066 3.4812,-1.12579 0.4543,-0.73496 2.6378,-0.92536 6.2897,-0.54845 3.6528,0.37701 5.0801,0.25247 4.1132,-0.3589 -1.098,-0.6943 -0.6408,-0.94019 1.7694,-0.95155 1.7875,-0.008 3.25,0.47506 3.25,1.0744 0,1.56809 4.1903,4.83786 6.25,4.87702 1.0766,0.0205 1.75,-0.71309 1.75,-1.90636 0,-1.50496 -0.8404,-2.02755 -3.75,-2.3319 -2.0625,-0.21575 0.099,-0.46791 4.8037,-0.56037 7.4483,-0.14638 9.2413,0.17458 13.8752,2.48377 4.8188,2.40131 5.4093,2.49517 6.2497,0.99339 0.7085,-1.26595 1.3725,-1.4207 2.8053,-0.65385 1.3965,0.74737 2.2851,0.59676 3.47,-0.58813 2.0761,-2.07611 4.84,-7.4427 4.1754,-8.10728 -0.2849,-0.28498 0.3163,-2.83066 1.3361,-5.65707 4.8861,-13.54183 4.628,-40.58252 -0.555,-58.13893 -3.5553,-12.04318 -3.9136,-16.07807 -1.9093,-21.50094 0.9145,-2.47448 1.9166,-5.62406 2.2267,-6.99906 0.3102,-1.375 1.1733,-2.85986 1.9181,-3.29969 1.8334,-1.08273 1.7117,-6.2249 -0.217,-9.16844 -1.1965,-1.82609 -1.3157,-2.8749 -0.5,-4.39907 0.5891,-1.10072 1.0764,-3.2684 1.083,-4.81706 0.01,-1.54866 0.6639,-5.26603 1.4609,-8.26083 1.3998,-5.25966 1.3603,-5.65127 -1.1579,-11.5 -1.4338,-3.3302 -2.7011,-7.40491 -2.8161,-9.05491 -0.4596,-6.59156 -1.7356,-9.48128 -5.816,-13.17175 -2.3006,-2.08064 -4.0918,-4.06614 -3.9806,-4.41222 0.2217,-0.68993 -2.309,-1.95307 -7.7022,-3.84428 -3.3698,-1.1817 -17.492,-1.50376 -19.2161,-0.43822 -0.4614,0.28518 -2.9537,-0.88225 -5.5384,-2.59429 -4.3108,-2.85535 -5.3216,-3.09763 -12.2225,-2.92939 -12.4628,0.30384 -49.13917,0.31634 -55.023,0.0188 -6.93785,-0.35089 -12.0663,-0.39969 -38,-0.36157 -1.925,0.003 -10.25,0.29039 -18.5,0.63903 -8.25,0.34863 -19.5,0.53319 -25,0.41013 -8.89529,-0.19904 -49.62178,-0.27113 -86,-0.15224 -7.15,0.0234 -20.875,-0.004 -30.5,-0.0607 -19.58297,-0.11551 -42.68606,0.11693 -54,0.54328 -10.31456,0.38869 -15.57182,0.2206 -29.5,-0.9432 -9.62925,-0.80459 -14.53586,-0.68903 -24.83574,0.58494 -10.64463,1.31661 -14.24424,1.38398 -21.08686,0.39464 -6.11679,-0.8844 -9.65134,-0.9096 -13.66426,-0.0974 -2.97723,0.60255 -13.96314,1.03135 -24.41314,0.9529 -74.46367,-0.55904 -147.97125,0.39964 -154.5,2.01498 -3.35658,0.83048 -7.21747,0.8058 -15.19474,-0.0971 -5.88211,-0.66577 -11.95711,-0.90806 -13.5,-0.53841 -1.54289,0.36964 -10.5503,1.03866 -20.01646,1.48671 -18.5653,0.87872 -20.0792,1.31608 -25.06482,7.24115 -1.32097,1.56989 -2.9844,2.85434 -3.69651,2.85434 -0.99324,0 -8.26875,6.98967 -8.59039,8.25288 -0.0346,0.13592 -0.42439,4.03378 -0.86618,8.66192 -0.71026,7.44055 -1.10422,8.63404 -3.40272,10.30838 -2.79694,2.03743 -4.54083,7.93523 -2.96801,10.03778 1.1014,1.47236 1.10427,26.705 0.003,28.44126 -0.4193,0.66122 -0.70267,4.26122 -0.6297,8 0.073,3.73878 0.10417,8.31731 0.0694,10.17452 -0.0348,1.85721 0.60224,4.66381 1.41571,6.23689 1.31502,2.54296 1.3033,3.27747 -0.10563,6.62326 -1.17818,2.79781 -1.42267,5.43047 -0.95313,10.26311 0.47192,4.8571 0.22606,7.463 -0.97274,10.31005 -1.35066,3.20771 -1.42356,4.72859 -0.46118,9.62031 0.83713,4.25504 0.84744,6.36272 0.0385,7.87421 -1.87047,3.495 -1.35374,14.28386 0.89541,18.69543 2.52586,4.95434 2.50756,6.52543 -0.12808,10.9925 -1.91696,3.24901 -2.01942,4.1479 -1.03277,9.06077 0.60242,2.99967 0.85918,6.0693 0.57057,6.8214 -0.28861,0.7521 0.17614,2.06833 1.03277,2.92496 1.87203,1.87203 2.03984,3.85068 0.30751,3.62572 -4.16556,-0.54092 -4.75,0.0351 -4.75,4.68164 0,3.49255 0.33179,4.47967 1.37158,4.08066 1.45073,-0.55669 5.62842,4.29514 5.62842,6.53667 0,0.71791 -0.81106,2.87363 -1.80235,4.79049 -0.99129,1.91685 -1.76407,4.16019 -1.71729,4.98519 0.32108,5.66255 2.00024,13.00769 3.61364,15.80716 2.72661,4.73102 2.43535,8.82592 -0.89778,12.62214 -2.66144,3.03121 -2.78941,3.62174 -2.52069,11.63201 0.38046,11.34151 1.67066,23.1348 2.71139,24.78404 0.48435,0.76754 0.40471,2.27075 -0.18544,3.5 -3.12125,6.50144 -3.68193,19.94497 -0.97468,23.37006 0.52837,0.66848 0.66175,2.9848 0.29638,5.14738 -0.42591,2.52097 -0.25865,4.18266 0.4661,4.63059 0.7763,0.47978 0.59362,1.09112 -0.58318,1.95163 -1.61031,1.17748 -1.6154,1.93324 -0.0844,12.53926 0.89604,6.20744 1.38241,11.6855 1.08084,12.17346 -0.30158,0.48797 0.18786,3.10365 1.08764,5.81264 1.13241,3.40937 1.33936,5.48013 0.67233,6.72754 -0.53,0.99115 -1.26069,5.91389 -1.62375,10.93943 -0.50548,6.99687 -0.28349,10.43287 0.94764,14.6678 0.89648,3.08379 1.71835,10.10144 1.85775,15.86267 0.14608,6.03698 0.78136,11.29866 1.52819,12.65705 0.75463,1.37259 1.04511,3.83023 0.70916,6 -0.54749,3.53613 -1.78789,22.68686 -1.71977,26.5518 0.0182,1.03216 0.95675,2.73719 2.08568,3.78896 1.12894,1.05176 2.05261,2.838 2.05261,3.96943 0,2.95864 -2.96131,12.72301 -4.06559,13.40548 -2.1958,1.35709 -0.4624,13.07434 2.35027,15.88701 2.12512,2.12512 2.9985,10.33008 1.3501,12.6835 -1.01854,1.45417 -1.26877,5.26778 -1.01503,15.46976 0.18522,7.4469 0.55894,13.89931 0.8305,14.3387 0.27155,0.43939 0.96097,7.78142 1.53203,16.31564 0.74532,11.13842 1.63244,17.17422 3.14396,21.39081 1.15813,3.23073 2.41027,9.02405 2.78255,12.87405 0.73193,7.5694 3.90494,13.87381 7.59121,15.08281 1.1,0.36078 4.475,1.82014 7.5,3.24304 5.50052,2.58732 6.21834,2.65662 20.5,1.97912 5.45311,-0.25868 35.87764,1.33692 36.5,1.91424 0.72877,0.67601 10.05112,-0.6762 12.05487,-1.74857 z m 174.8586,-265.13233 c -0.79004,-1.47619 -1.40539,-1.86255 -1.67557,-1.05202 -0.43908,1.31725 1.70056,4.60858 2.48562,3.82352 0.24119,-0.24118 -0.12334,-1.48836 -0.81005,-2.7715 z M 421,468.0765 c 0,-0.825 -0.42344,-1.5 -0.94098,-1.5 -1.26098,0 -2.1641,1.56159 -1.36517,2.36052 C 419.82004,470.0632 421,469.62291 421,468.0765 z m 231.74107,-4.57752 c 2.52742,-2.2191 4.14146,-2.9178 5.78653,-2.50491 2.12059,0.53224 2.25916,0.2953 1.96549,-3.36075 -0.26704,-3.32452 -1.29707,-4.8971 -6.65452,-10.1597 -3.79979,-3.73252 -7.54016,-6.47724 -9.33857,-6.85274 -1.65,-0.3445 -3.00641,-1.05792 -3.01424,-1.58538 -0.027,-1.815 -14.60926,-17.459 -16.27414,-17.459 -0.52889,0 -1.21521,-1.2375 -1.52514,-2.75 -0.30994,-1.5125 -1.54716,-3.35127 -2.74937,-4.08615 -2.00183,-1.22365 -2.54548,-0.9832 -6.4574,2.85606 -2.34934,2.30571 -4.58356,4.09826 -4.96492,3.98345 -0.38136,-0.11481 -1.82173,0.77234 -3.20083,1.97145 -2.1871,1.90166 -2.40603,2.64942 -1.71356,5.8527 0.43664,2.01987 0.85523,5.47249 0.9302,7.67249 0.23618,6.93102 0.39685,7.41151 3.76084,11.24712 1.8103,2.06408 3.8363,5.01376 4.50224,6.55484 1.71841,3.97668 6.4274,5.66969 13.88812,4.99318 7.83327,-0.7103 15.3182,0.36929 15.3182,2.20943 0,1.39476 3.68354,4.49543 5.34049,4.49543 0.49251,0 2.47277,-1.38488 4.40058,-3.07752 z m 55.96918,-56.92248 c 0.28766,-1.1 0.89502,-2 1.3497,-2 0.45468,0 1.97294,-1.9125 3.37391,-4.25 2.42137,-4.04003 3.2543,-3.72462 2.64079,1 -0.2341,1.80277 1.59998,1.54029 2.31836,-0.33179 1.05547,-2.7505 0.6566,-10.9686 -0.59301,-12.21821 -0.66,-0.66 -2.93045,-1.2 -5.04545,-1.2 -2.73904,0 -4.54468,-0.69922 -6.27566,-2.4302 -1.99478,-1.99478 -3.56967,-2.47151 -8.78992,-2.66076 -7.03659,-0.2551 -8.68897,0.32277 -8.68897,3.03869 0,1.28945 -1.0049,2.01821 -3.40345,2.46818 -3.24954,0.60962 -4.59655,2.11205 -4.59655,5.12692 0,2.04865 3.99871,5.3949 5.67715,4.75082 1.96458,-0.75388 6.5105,1.77496 5.9265,3.29684 -1.20443,3.1387 5.35319,7.04446 12.23997,7.2902 2.5601,0.0913 3.46618,-0.34936 3.86663,-1.88069 z M 409.0369,403.03204 c 0.8621,-1.03877 2.1807,-1.34702 4.02724,-0.94145 1.74765,0.38384 3.04407,0.12742 3.56708,-0.70554 1.62102,-2.5817 1.87242,-17.70491 0.32013,-19.2572 -0.6018,-0.6018 -0.95135,-0.36956 -0.95135,0.63207 0,0.93291 -1.12873,1.7992 -2.74745,2.10863 -2.54283,0.4861 -3.45894,-0.0628 -4.66016,-2.79205 -0.25905,-0.58857 -0.82075,-0.45911 -1.36523,0.31465 -1.04098,1.47931 -0.45383,5.92722 0.89224,6.75914 0.48433,0.29934 0.8806,1.89424 0.8806,3.54424 0,1.74536 -0.41821,2.74153 -1,2.38197 -0.55,-0.33992 -1,-1.79148 -1,-3.22568 0,-5.51289 -1.19008,-1.0861 -1.51773,5.64557 -0.35778,7.35057 0.69182,8.98512 3.55463,5.53565 z m 647.3574,-242.87035 c -0.4349,-1.13332 0.3008,-1.30165 3.6975,-0.84606 3.8769,0.52001 4.1735,0.40556 3.4608,-1.33519 -0.4287,-1.04717 -1.0234,-2.80394 -1.3215,-3.90394 -0.2981,-1.1 -1.1471,-2.88763 -1.8866,-3.97251 -0.7395,-1.08487 -1.3894,-3.10987 -1.4442,-4.5 l -0.1,-2.52749 -0.8006,2.5 c -0.6011,1.87684 -0.8255,2.03327 -0.9003,0.62756 -0.077,-1.44978 -0.4026,-1.62104 -1.4417,-0.75868 -0.7381,0.61257 -1.6272,0.82855 -1.9758,0.47994 -0.3486,-0.3486 -1.3123,-0.0708 -2.1415,0.61737 -1.262,1.04737 -1.6729,0.81643 -2.5223,-1.41767 -0.558,-1.46788 -1.4655,-2.39023 -2.0165,-2.04968 -1.4532,0.8981 -1.2284,3.81947 0.4663,6.06003 0.8075,1.06762 1.4825,2.72044 1.5,3.67294 0.017,0.95249 1.5693,3.31499 3.4484,5.25 3.6428,3.75104 4.8562,4.39269 3.9777,2.10338 z M 305,112.19837 c 3.025,0.0541 8.875,0.23217 13,0.39564 4.125,0.16346 18.75,0.25489 32.5,0.20316 13.75,-0.0517 37.15,-0.0223 52,0.0654 14.85,0.0877 33.3,0.11433 41,0.0592 7.7,-0.0551 16.25,-0.0808 19,-0.0572 22.32895,0.19197 58.22815,-0.61012 63.67363,-1.42266 5.29685,-0.79036 7.25673,-0.70401 9.5,0.41855 2.17664,1.08922 4.55049,1.22578 10.32637,0.59403 6.38563,-0.69844 20.42595,-1.53009 31.5,-1.86583 1.65,-0.05 5.10159,0.19422 7.6702,0.54277 2.59541,0.35218 5.47508,0.18328 6.48192,-0.38017 1.31527,-0.73606 2.52162,-0.59454 4.40241,0.51647 2.38629,1.40962 2.92085,1.36193 6.77538,-0.6045 4.08943,-2.08628 4.34083,-2.09718 11.04495,-0.47906 4.76596,1.15033 8.5571,1.44382 12.41852,0.96136 l 5.55826,-0.69446 0.32418,-8.03591 c 0.1783,-4.419764 -0.0161,-8.244794 -0.43188,-8.500084 -0.41584,-0.25529 -2.44084,-0.38377 -4.5,-0.28551 -5.49665,0.26228 -11.82985,0.27111 -30.24394,0.0422 -11.82487,-0.14701 -17.63336,0.18297 -20.5,1.16459 -5.4154,1.85439 -26.02459,2.25044 -34.05417,0.65441 -4.74506,-0.94317 -8.1724,-1.01191 -13.17928,-0.26434 -4.11417,0.61428 -9.51044,0.67829 -13.76655,0.1633 -3.85,-0.46585 -11.95,-1.18669 -18,-1.60186 -6.05,-0.41517 -11.5152,-1.0799 -12.14488,-1.47718 -0.62969,-0.39728 -3.44,-0.28707 -6.24513,0.24491 -3.30851,0.62745 -7.64892,0.6206 -12.35512,-0.0195 -10.03651,-1.36506 -62.48889,-1.71937 -90.25487,-0.60966 -12.65,0.50558 -32.9,0.97556 -45,1.0444 -12.1,0.0688 -28.51936,0.74699 -36.48747,1.507 -11.48766,1.09571 -16.04302,1.13864 -22,0.20735 -4.13189,-0.64597 -11.33753,-1.10202 -16.01253,-1.01345 -4.675,0.0886 -11.68853,0.0479 -15.58562,-0.0903 -3.91918,-0.13901 -8.04095,0.25995 -9.22338,0.89277 -2.52873,1.35334 -7.45003,1.58729 -15.691,0.74592 -4.00522,-0.40892 -5.16884,-0.31843 -3.5,0.27218 2.12242,0.75113 1.7826,0.89981 -2.25,0.98444 -4.77748,0.10026 -6.92005,2.09968 -2.25,2.09968 2.25,0 2.5,0.4 2.5,4.000004 0,3.13439 0.37871,4.00481 1.75,4.02224 0.9625,0.0122 2.875,0.90222 4.25,1.97776 3.50418,2.74101 4,2.51789 4,-1.8 0,-4.09055 1.39258,-6.2 4.09301,-6.2 1.86334,0 2.90699,1.94831 2.90699,5.4268 0,1.24477 0.94674,3.12047 2.10387,4.16821 2.16675,1.96193 5.55329,2.23279 19.39613,1.55131 9.66211,-0.47566 33.36812,0.38783 34.21894,1.24642 0.42958,0.4335 4.15606,0.41526 8.28106,-0.0405 4.125,-0.4558 9.975,-0.78444 13,-0.73032 z m -90.67589,-2.0241 c 1.18139,-3.07866 -2.70858,-3.61641 -4.32411,-0.59777 -0.93377,1.74477 -0.76049,2 1.35783,2 1.3355,0 2.67033,-0.63101 2.96628,-1.40223 z"
+         id="path3121"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#584633"
+         d="m -27.36019,965.8027 c -0.66859,-1.0818 8.06336,-18.18773 10.8352,-21.2262 4.13103,-4.52841 4.52499,-6.39098 4.52499,-21.39341 0,-16.24987 -1.31916,-28.12913 -3.78745,-34.10659 -1.47209,-3.56498 -7.34259,-13.13221 -11.79121,-19.2163 -2.12872,-2.91131 -3.20016,-16.44821 -4.00963,-50.65901 -0.94645,-39.99956 0.29406,-46.72443 11.73657,-63.62469 2.28,-3.36749 4.13834,-7.63251 4.79287,-11 1.55407,-7.99546 0.73561,-34.49122 -1.22015,-39.5 -0.85903,-2.2 -1.83765,-5.65865 -2.17472,-7.6859 -0.43325,-2.60567 -2.35197,-5.60494 -6.54697,-10.23396 -7.78662,-8.59223 -9.50396,-14.05243 -8.65882,-27.53036 0.32936,-5.25238 0.14315,-15.84978 -0.41379,-23.54978 -1.21894,-16.85257 -1.15017,-31.65262 0.1707,-36.73304 0.53381,-2.05318 0.98467,-7.53498 1.00191,-12.18178 0.0225,-6.0605 0.43405,-8.78294 1.45593,-9.63102 2.63559,-2.18735 11.93149,-15.33896 13.36824,-18.91307 0.78291,-1.9476 1.37262,-6.01609 1.31046,-9.04109 -0.0622,-3.025 -0.13203,-11.54669 -0.15526,-18.93709 -0.0523,-16.63671 -1.30757,-20.95686 -9.02577,-31.06291 -9.02851,-11.82173 -8.64641,-10.27166 -9.61378,-39 -1.18349,-35.14638 -1.26023,-41.56469 -0.69264,-57.93073 l 0.56983,-16.43072 5.10664,-5.56928 c 7.46347,-8.13963 9.20701,-10.99774 10.10776,-16.56927 0.9054,-5.60036 0.88236,-40.21454 -0.0301,-45.24265 -0.36053,-1.98661 -2.89012,-5.8601 -6.53053,-10 -7.37174,-8.3832 -11.11675,-17.24634 -10.94242,-25.89692 0.065,-3.22324 -0.0899,-11.93543 -0.34411,-19.36043 -0.90714,-26.49587 -0.81169,-49.55385 0.22148,-53.5 0.576,-2.2 1.058,-6.25666 1.07112,-9.01481 0.0271,-5.69774 2.43251,-10.93795 7.7188,-16.81552 6.03448,-6.70945 7.22948,-10.99322 7.95134,-28.50369 0.98227,-23.82727 -1.53151,-35.69264 -9.14473,-43.16446 -3.23447,-3.17439 -5.09035,-6.19025 -6.73337,-10.94188 -2.23103,-6.452144 -2.2682,-7.321664 -2.2682,-53.059644 0,-51.597078 -0.20284,-49.870248 6.77068,-57.639564 6.60815,-7.362239 7.96416,-11.403122 9.09753,-27.110436 l 1.02821,-14.25 506.60243,0 c 403.17975,0 507.15195,0.255187 509.29395,1.25 2.2831,1.060282 2.6928,1.876459 2.6994,5.377555 0,2.375386 -0.6017,4.633372 -1.4279,5.319098 -1.9685,1.633703 -2.9887,6.83706 -1.6555,8.443497 0.5972,0.719528 1.546,3.735125 2.1085,6.701327 1.2615,6.651622 3.4094,8.912574 9.086,9.56413 2.4182,0.277564 5.7181,1.00793 7.333,1.623035 1.615,0.615106 4.1736,1.024106 5.6857,0.908888 1.7631,-0.134347 3.2379,0.488215 4.1117,1.735687 1.2216,1.744173 2.3908,1.913506 11.3144,1.638719 5.4735,-0.168549 10.8519,-0.530501 11.9519,-0.804336 1.1,-0.273836 2.9,-0.02728 4,0.547911 6.0938,3.186419 37.657,0.822672 42.6016,-3.190408 1.0946,-0.888307 3.5404,-6.115103 5.4353,-11.615103 2.8968,-8.408309 3.4466,-11.39273 3.4542,-18.75 l 0.01,-8.75 40.5796,0 40.5796,0 -0.6525,6.25 c -0.4796,4.593802 -0.244,7.215561 0.8894,9.89374 1.2299,2.90646 1.4168,5.978206 0.9236,15.181012 -0.4459,8.321112 -0.2404,12.880627 0.7372,16.356261 1.4475,5.146514 1.677,11.151282 1.006,26.318987 l -0.4203,9.5 3.6739,4 c 2.0207,2.2 3.6761,4.311778 3.6787,4.69284 0,0.381062 -0.9252,2.269044 -2.0618,4.195516 -1.1367,1.926472 -2.3272,6.027214 -2.6457,9.112764 l -0.579,5.61009 2.6457,-0.66401 2.6456,-0.66402 0,8.62985 c 0,8.20716 -0.121,8.68498 -2.4704,9.75543 -1.8889,0.86067 -2.8304,0.8268 -4,-0.14388 -1.3516,-1.12176 -1.5296,-0.31674 -1.5296,6.91872 0,4.5035 0.5304,9.1711 1.1787,10.37244 0.6838,1.26719 1.2935,7.642374 1.4522,15.184264 0.1504,7.15 0.3142,14.575 0.3638,16.5 0.05,1.925 -0.5137,11.375 -1.252,21 -0.7383,9.625 -1.246,21.03509 -1.1283,25.35576 0.1906,6.99394 0.5064,8.1609 2.8788,10.63714 2.2811,2.38096 2.4883,3.06381 1.4395,4.7433 -1.4467,2.31652 -0.4809,7.33115 1.3275,6.8924 0.6819,-0.16545 0.9023,-0.11206 0.4898,0.11863 -1.1118,0.62176 -0.9096,3.25277 0.25,3.25277 1.9013,0 0.9919,1.86774 -1.25,2.56739 -1.2375,0.3862 -2.5307,1.13861 -2.8737,1.67204 -0.9722,1.51187 0.05,16.96668 1.2149,18.3705 0.5724,0.68963 1.2604,5.22202 1.529,10.07197 0.2685,4.84996 0.9139,8.9681 1.434,9.15143 1.1499,0.40527 1.2948,34.16667 0.1467,34.16667 -0.9353,0 -3.2009,5.88376 -3.2009,8.31252 0,0.91879 0.9,2.23259 2,2.91955 2.542,1.58749 2.5311,3.28148 -0.039,6.03984 -2.9865,3.20559 -3.5435,6.64857 -1.6183,10.00293 0.9113,1.58798 1.657,3.52577 1.657,4.3062 0,0.78043 0.45,1.41896 1,1.41896 0.55,0 1,2.25 1,5 0,2.75 -0.378,5 -0.8399,5 -0.8084,0 -1.6647,2.44596 -4.164,11.89336 -0.9386,3.54775 -0.8638,5.76121 0.3886,11.5 0.853,3.90865 1.818,9.24414 2.1444,11.85664 0.3318,2.65542 1.1176,4.75675 1.7822,4.76531 0.8215,0.0106 0.8546,0.24227 0.1073,0.75 -1.4559,0.98909 -3.7386,12.2574 -3.6583,18.05815 0.2475,17.85325 1.7276,32.74203 3.3551,33.74785 1.2033,0.7437 1.1643,131.42869 -0.039,131.42869 -0.7844,0 -1.8728,10.42457 -1.9838,19 -0.072,5.60206 0.7277,10.44001 1.785,10.79244 0.8252,0.27506 1.1227,52.68574 1.1227,197.79089 l 0,197.41667 -608.94098,0 c -334.91754,0 -609.15619,-0.3482 -609.41921,-0.7738 z M 1094.6429,933.94166 c 1.8949,-0.89917 4.1535,-3.03667 5.0192,-4.75 0.8657,-1.71334 2.7229,-4.64856 4.127,-6.52271 2.3068,-3.0789 2.5601,-4.33268 2.6264,-13 0.082,-10.73391 -1.8265,-24.96368 -3.9895,-29.74358 -0.7843,-1.73312 -1.426,-4.01718 -1.426,-5.07569 0,-3.09242 -4.2235,-6.20913 -11.962,-8.82725 -6.7805,-2.29399 -8.6858,-2.45313 -31.8748,-2.66221 -24.6491,-0.22225 -38.9998,0.94112 -43.6934,3.54212 -2.7084,1.50087 -9.4698,9.05275 -9.4698,10.57691 0,1.92997 -3.9951,13.16016 -5.4974,15.45305 -1.0579,1.61472 -1.1759,3.13195 -0.4776,6.1442 0.51,2.2 0.938,5.5975 0.9511,7.55 0.025,3.72152 1.4593,5.95 3.8295,5.95 0.7731,0 2.7509,1.13193 4.3951,2.5154 2.5665,2.15957 3.9308,2.50465 9.6443,2.43941 7.0377,-0.0804 19.3037,1.98038 22.6568,3.80642 4.7047,2.56207 10.4506,4.05034 16.2685,4.21377 3.4263,0.0962 7.5657,0.25375 9.1986,0.35 2.7671,0.16311 5.8621,2.45947 10.2811,7.62813 1.4585,1.70592 2.9325,2.04687 8.8489,2.04687 4.4988,0 8.3607,-0.59879 10.544,-1.63484 z M 118.56736,862.06097 c 2.23705,-0.0774 4.62218,-0.48358 5.30028,-0.90266 0.67809,-0.41909 2.8279,-0.005 4.77735,0.91997 2.17994,1.03445 4.37416,1.40428 5.69973,0.96067 1.1854,-0.3967 9.58028,-1.06426 18.65528,-1.48345 9.075,-0.41919 18.75,-1.29102 21.5,-1.9374 7.25616,-1.70552 12.17202,-1.47633 21.5,1.00242 6.96026,1.84957 37.0726,2.70087 57.5,1.62557 6.6,-0.34743 28.2,-0.89297 48,-1.21231 37.54679,-0.60557 42.92474,-0.82254 46.20651,-1.86413 1.09018,-0.34601 4.97885,-0.20472 8.64149,0.31397 4.41993,0.62594 19.01652,0.4906 43.40568,-0.40245 20.21047,-0.74005 50.69632,-1.38284 67.74632,-1.42844 17.05,-0.0456 36.625,-0.50415 43.5,-1.01902 6.875,-0.51487 23.63723,-0.93665 37.24939,-0.93728 13.61217,-6.3e-4 25.20756,-0.2843 25.76753,-0.63039 0.55998,-0.34609 4.3595,-0.0902 8.44339,0.56857 6.21151,1.00203 9.19179,0.93142 18.23246,-0.43194 5.94398,-0.89637 14.18223,-1.54823 18.30723,-1.44857 4.125,0.0997 15.2625,0.15277 24.75,0.11802 9.4875,-0.0348 18.7125,-0.0291 20.5,0.0126 1.7875,0.0417 6.85,-0.45857 11.25,-1.11164 4.4,-0.65307 13.08106,-1.39936 19.29124,-1.65844 6.21019,-0.25908 11.71664,-0.73396 12.23657,-1.05529 0.51993,-0.32133 2.62532,-0.12037 4.67865,0.44658 2.43837,0.67327 4.07329,0.69086 4.71343,0.0507 1.28887,-1.28889 10.58011,-1.27142 10.58011,0.0199 0,0.55 0.675,1 1.5,1 0.825,0 1.5,-0.6283 1.5,-1.39621 0,-1.07202 1.68343,-1.38245 7.25,-1.33693 4.6155,0.0377 8.86884,-0.56891 11.70496,-1.66948 6.56602,-2.54797 27.51084,-1.30326 29.21174,1.73599 1.3404,2.39521 6.5335,3.0931 9.3388,1.25501 2.6196,-1.71647 6.4945,-2.13711 6.4945,-0.70501 0,1.07556 3.0291,1.94956 4.75,1.37054 0.6875,-0.23132 1.25,-1.02678 1.25,-1.76769 0,-2.08607 4.1001,-2.18347 8.2909,-0.19695 3.2278,1.53003 4.6292,1.64201 9.4337,0.75384 3.1035,-0.57371 8.3726,-1.05 11.7091,-1.05842 7.0306,-0.0177 8.2361,-0.56887 8.7155,-3.98432 0.3263,-2.32524 0.7656,-2.51057 6.2957,-2.65625 6.0951,-0.16058 8.5349,-1.66513 8.5704,-5.28525 0.014,-1.37534 0.1415,-1.38227 1.0868,-0.0589 0.8759,1.22635 0.9894,1.11993 0.6219,-0.58333 -0.2831,-1.31188 0.055,-2.08334 0.9132,-2.08334 1.5815,0 1.5351,-0.13305 1.9047,5.45919 0.5828,8.81544 4.8885,8.7939 8.9836,-0.0449 1.5987,-3.45061 2.0717,-5.60204 1.4666,-6.67048 -1.1052,-1.95137 -6.3511,-8.01111 -5.5754,-6.4404 0.8704,1.76276 -2.2371,3.94292 -3.632,2.54805 -0.8406,-0.84065 -0.828,-1.79437 0.049,-3.71993 l 1.1798,-2.58944 -4.7569,0.69861 c -2.6164,0.38424 -5.882,1.15339 -7.257,1.70923 -1.375,0.55585 -7.45,0.90976 -13.5,0.78648 -9.2746,-0.18898 -11.3238,-0.52574 -13.0645,-2.14692 -2.3955,-2.23113 -5.9099,-2.42001 -9.3697,-0.50357 -1.7548,0.972 -3.2066,1.07907 -5.2016,0.38362 -1.8485,-0.64441 -4.5888,-0.58658 -8.2534,0.17418 -4.5155,0.93742 -5.99,0.87826 -8.3352,-0.33446 -1.811,-0.93651 -7.2081,-1.67109 -14.8124,-2.01604 -6.83435,-0.31002 -13.67807,-1.1849 -15.9632,-2.0407 -4.64813,-1.74074 -15.07798,-2.07765 -16.04179,-0.51819 -0.45074,0.72933 -4.66797,0.83517 -13.30902,0.33404 -6.95665,-0.40352 -14.67379,-0.6499 -17.14879,-0.54756 -2.475,0.10233 -16.425,0.59391 -31,1.09238 -14.575,0.49848 -33.7,1.18334 -42.5,1.52192 -8.8,0.33857 -17.125,0.52226 -18.5,0.40819 -2.40721,-0.1997 -12.92992,-0.24983 -33,-0.15722 -5.225,0.0241 -13.775,0.0519 -19,0.0618 -12.15353,0.023 -49.37186,0.90919 -77,1.83341 -11.825,0.39557 -27.8,0.60931 -35.5,0.47498 -7.7,-0.13433 -18.05,0.31044 -23,0.9884 -4.95,0.67795 -9.9,1.19336 -11,1.14536 -17.79131,-0.77634 -45.37704,-0.28659 -61.01312,1.08322 -13.44855,1.17817 -20.67918,1.3945 -24.70578,0.73915 -3.72756,-0.60668 -9.07364,-0.54311 -15.48688,0.18414 -5.38682,0.61086 -11.14422,1.08205 -12.79422,1.04709 -1.65,-0.0349 -6.6,0.33601 -11,0.82436 -4.4,0.48836 -20.13012,1.12293 -34.95583,1.41017 -14.82571,0.28724 -28.73486,1.00129 -30.90923,1.58679 -2.17437,0.5855 -5.55148,0.76474 -7.5047,0.39831 -1.95321,-0.36642 -6.94406,-0.1715 -11.09077,0.43317 -4.14671,0.60466 -20.13947,1.56431 -35.53947,2.13254 -41.9174,1.54667 -47.58315,2.17013 -51.68699,5.68764 -0.92784,0.79528 -2.22752,1.11189 -2.88817,0.70359 -2.49776,-1.5437 -9.77271,-1.4829 -19.67484,0.16443 l -10.25,1.70521 0.0151,3.5884 c 0.0234,5.56802 2.33942,11.04087 5.32871,12.59174 3.92367,2.03562 10.80106,3.40614 13.65623,2.7214 1.375,-0.32976 4.33031,-0.66288 6.56736,-0.74026 z M 258,788.60593 c 9.075,-0.54693 26.4,-0.89075 38.5,-0.76406 12.1,0.12669 37.525,-0.36107 56.5,-1.0839 18.975,-0.72284 43.05,-1.46257 53.5,-1.64386 10.45,-0.18129 25.975,-0.78617 34.5,-1.34418 8.525,-0.55801 23.15,-1.09379 32.5,-1.19062 9.35,-0.0968 22.625,-0.3543 29.5,-0.57216 12.6821,-0.40188 39.78606,-0.49834 48,-0.17082 2.475,0.0987 8.55,-0.36369 13.5,-1.02751 4.95,-0.66382 19.26143,-1.20089 31.80317,-1.19348 12.54175,0.007 23.26415,-0.27143 23.82755,-0.61963 0.56341,-0.3482 10.32698,-0.8199 21.69683,-1.04821 29.8442,-0.59928 44.03803,-1.71636 54.67245,-4.30283 5.84066,-1.42054 21.62772,-1.60537 24.10017,-0.28215 3.36772,1.80235 15.36194,1.70582 19.61771,-0.15788 4.948,-2.16684 5.78212,-2.06116 5.78212,0.73257 0,2.07164 0.58163,2.42874 4.75,2.91627 7.06713,0.82658 10.39845,-0.0531 10.04176,-2.65154 -0.27449,-1.99964 0.19654,-2.14263 7.95824,-2.41588 5.7702,-0.20314 8.25,0.0591 8.25,0.87244 0,0.86386 0.3477,0.87429 1.3523,0.0406 0.7438,-0.61729 4.0489,-1.40419 7.3446,-1.74866 4.9878,-0.52133 6.0969,-0.35372 6.6163,0.9999 0.7808,2.03482 7.2371,2.21875 9.1939,0.26192 1.8271,-1.82707 0.019,-3.63571 -3.6339,-3.63571 -3.4446,0 -5.8732,-4.42416 -5.8732,-10.69909 0,-8.07491 -5.6288,-11.06337 -18.7564,-9.95811 -14.73364,1.24048 -23.91169,2.33403 -24.944,2.97204 -1.99044,1.23016 -28.61099,1.08549 -33.04771,-0.1796 -2.97637,-0.84869 -8.66434,-1.01779 -19,-0.56487 -8.11354,0.35554 -21.95189,0.81542 -30.75189,1.02197 -8.8,0.20654 -17.19608,0.58823 -18.65796,0.84819 -1.46188,0.25996 -3.93688,0.11506 -5.5,-0.322 -1.56312,-0.43707 -14.31704,-0.30503 -28.34204,0.2934 -14.025,0.59844 -32.025,0.82011 -40,0.49261 -7.975,-0.32751 -19.9,-0.21739 -26.5,0.2447 -10.63374,0.74451 -40.42157,1.03999 -93.98105,0.93226 -9.33958,-0.0188 -18.62282,0.40792 -20.62942,0.94825 -2.0066,0.54032 -6.96513,0.92471 -11.01895,0.8542 -9.68327,-0.16843 -44.12969,0.90853 -49.87058,1.55919 -2.475,0.28051 -6.12477,0.1321 -8.1106,-0.32981 -1.98582,-0.4619 -8.06082,-0.44202 -13.5,0.0442 -18.02226,1.61102 -23.57262,1.81441 -64.3894,2.35945 -22.275,0.29745 -45.9,0.95654 -52.5,1.46464 -6.6,0.5081 -21.30944,0.9012 -32.68765,0.87355 -11.37821,-0.0276 -21.27734,0.31417 -21.99806,0.7596 -0.72072,0.44543 -6.93627,0.87254 -13.81234,0.94914 -13.79384,0.15366 -22.53364,1.85081 -28.81232,5.59496 l -3.98671,2.37739 2.89854,2.89853 c 3.32424,3.32424 3.4579,3.8561 1.39854,5.56521 -3.67245,3.04786 -0.22311,6.47383 7.5,7.44917 3.025,0.38203 7.3,0.90625 9.5,1.16495 7.3393,0.86304 53.77281,1.95419 71.5,1.68019 9.625,-0.14876 24.925,-0.71796 34,-1.26488 z m 491.99993,-16.0883 c 4e-5,-0.30738 0.70844,-1.43238 1.57423,-2.5 0.86578,-1.06762 1.24626,-1.3091 0.84549,-0.53662 -0.53305,1.02745 -0.35161,1.16945 0.67584,0.52893 2.11528,-1.31868 4.72866,-1.527 5.40606,-0.43093 0.3318,0.53686 -0.0499,0.72428 -0.84996,0.41729 -0.94424,-0.36234 -1.39969,0.0378 -1.30194,1.14383 0.11158,1.2625 -0.68768,1.73146 -3.09972,1.81875 -1.78754,0.0647 -3.25004,-0.13387 -3.25,-0.44125 z M 838.5,748.5765 c -0.3399,-0.55 -2.6165,-1 -5.059,-1 -2.4426,0 -4.441,0.45 -4.441,1 0,0.55 2.2766,1 5.059,1 3.1181,0 4.8219,-0.38367 4.441,-1 z m 240.6479,-2.67158 c 2.4959,0.65269 7.3454,-1.56559 8.1806,-3.74197 0.3139,-0.81814 2.8401,-2.46376 5.6137,-3.65693 6.5179,-2.80394 8.7797,-6.50531 10.2847,-16.83107 0.9671,-6.63586 0.9292,-8.76186 -0.2114,-11.84308 -0.7875,-2.12736 -1.2794,-6.49591 -1.1348,-10.07703 0.3037,-7.51746 -1.1127,-10.23573 -6.8619,-13.16874 -2.1736,-1.10887 -4.4344,-2.91764 -5.0241,-4.01948 -0.8495,-1.58727 -1.9892,-1.96866 -5.4877,-1.83633 -2.4285,0.0919 -4.9986,-0.31222 -5.7113,-0.89795 -1.8885,-1.55221 -9.5502,-2.16352 -28.882,-2.30442 -11.1674,-0.0814 -17.5189,0.25377 -18.2269,0.96183 -0.5978,0.59771 -1.8655,1.08675 -2.8172,1.08675 -2.1799,0 -2.903,4.09651 -0.9866,5.58949 2.1958,1.71069 -7.8625,1.53828 -10.311,-0.17674 -2.8312,-1.98302 -3.1153,-1.82909 -3.3909,1.83725 -0.1344,1.7875 -1.8051,6.4553 -3.7127,10.37289 -1.9076,3.91758 -3.4684,7.79998 -3.4684,8.62755 0,0.82757 -0.675,2.06487 -1.5,2.74956 -2.0804,1.72662 -1.8743,5.22552 0.6206,10.53318 3.1936,6.79418 5.4101,8.06606 15.2686,8.76179 4.6793,0.33022 9.8586,1.29895 11.5096,2.15272 1.6511,0.85377 4.6595,1.55231 6.6855,1.55231 4.7018,0 11.4249,2.00438 13.3917,3.9925 0.8382,0.84728 2.3157,2.76122 3.2834,4.25319 2.5152,3.87793 7.053,5.97393 11.2349,5.1894 2.5056,-0.47005 3.8834,-0.20023 5.0781,0.99443 1.2638,1.26385 1.9577,1.37543 3.0282,0.48697 0.7638,-0.63389 2.3601,-0.89853 3.5473,-0.58807 z m -24.5654,-61.19673 c -3.4116,-0.73867 -4.7296,-3.13169 -1.7249,-3.13169 1.1134,0 2.3025,-0.45 2.6424,-1 1.0205,-1.65119 4.3605,-1.12917 5.418,0.8468 0.68,1.27064 0.6286,2.20659 -0.1648,3 -1.2363,1.23626 -1.6817,1.25682 -6.1707,0.28489 z m -819.52763,51.83895 c 1.0681,-0.57164 3.79452,-0.47713 7.27078,0.25202 4.30975,0.90398 6.98156,0.88738 11.86811,-0.0738 3.9918,-0.78515 14.74741,-1.21261 29.30624,-1.16472 12.65,0.0416 25.925,0.0303 29.5,-0.0251 3.575,-0.0554 14.825,-0.007 25,0.10769 15.16742,0.17087 42.2759,-0.62276 54,-1.58093 1.375,-0.11237 4.65133,0.17332 7.28074,0.63486 2.92666,0.51372 11.07095,0.33364 21,-0.46435 8.92059,-0.71693 20.04426,-1.15124 24.71926,-0.96513 14.70993,0.58561 18.05469,0.57458 36.5,-0.12036 9.9,-0.373 33.3,-0.85546 52,-1.07214 18.7,-0.21668 49.91428,-0.79439 69.36508,-1.2838 19.45079,-0.4894 39.47579,-0.53115 44.5,-0.0928 6.29472,0.54923 12.71046,0.36093 20.63492,-0.60565 11.25206,-1.37246 44.60842,-2.19086 68.5,-1.68066 6.6,0.14094 13.8,-0.23844 16,-0.84306 3.11277,-0.85549 5.39383,-0.77272 10.28399,0.37318 4.9792,1.16676 7.57471,1.24968 12.50001,0.39939 5.5996,-0.96671 21.7475,-1.36981 32.216,-0.80421 2.2,0.11886 14.6706,0.0517 27.7125,-0.14928 26.8201,-0.41327 27.766,-0.67198 30.5501,-8.3561 2.6109,-7.20595 4.0852,-22.53058 3.5388,-36.78294 -0.4354,-11.35469 -0.2366,-14.27552 1.233,-18.12376 1.6497,-4.31965 1.6547,-4.95148 0.086,-10.81833 -1.8131,-6.78246 -2.0556,-17.74846 -1.1878,-53.73075 0.3463,-14.36051 0.018,-25.79228 -1.0975,-38.17113 -0.9008,-10.00009 -1.2479,-18.89914 -0.7996,-20.5 0.4358,-1.55588 0.6599,-3.27887 0.4982,-3.82887 -0.1618,-0.55 -0.2423,-3.56512 -0.1791,-6.70026 0.1376,-6.81563 -1.0215,-8.08158 -2.7435,-2.9965 -3.2638,9.63833 -2.42,8.9456 -10.4225,8.55582 -3.9539,-0.19258 -12.0153,-0.51811 -17.9142,-0.72339 -8.0326,-0.27953 -11.3922,-0.81023 -13.3818,-2.1139 -1.8056,-1.18304 -3.7471,-1.5637 -6.0607,-1.18825 -1.8722,0.30382 -5.162,-0.0678 -7.3105,-0.82586 -2.845,-1.00377 -4.86,-1.11499 -7.4157,-0.40933 -2.6204,0.72355 -4.3967,0.59812 -7.0135,-0.49522 -2.1316,-0.89067 -5.5779,-1.31497 -8.7984,-1.08326 -14.5285,1.0453 -19.01573,1.01322 -20.67334,-0.14782 -1.40644,-0.98511 -2.50555,-0.87924 -5.69453,0.54851 -3.52932,1.58012 -5.03913,1.65051 -14.12523,0.65854 -8.19755,-0.89497 -10.63543,-1.54463 -12.55171,-3.34489 -1.30771,-1.22871 -3.10983,-2.2341 -4.00442,-2.2341 -0.8946,0 -1.8664,-0.3881 -2.15956,-0.86245 -0.29316,-0.47435 -6.04462,-0.71263 -12.78102,-0.5295 -10.47929,0.28486 -12.61306,0.62469 -14.77599,2.35326 -4.37924,3.49978 -8.16427,4.64239 -21.528,6.49875 -20.89841,2.90302 -24.4348,2.67463 -34.86724,-2.25184 -4.87698,-2.30303 -10.57571,-5.65453 -12.66385,-7.44777 -2.08813,-1.79325 -5.80757,-4.69741 -8.26542,-6.45369 l -4.46881,-3.19323 -3.31162,2.44323 c -1.9821,1.46235 -4.73914,2.4661 -6.86734,2.50019 -3.04951,0.0488 -4.08127,0.74732 -7.24733,4.9063 -4.70139,6.17582 -11.7307,9.10506 -23.5158,9.79948 -7.09061,0.4178 -8.79151,0.18307 -12.5,-1.725 C 558.4318,527.3415 553,521.72598 553,518.42277 c 0,-1.5113 -0.48729,-5.01998 -1.08286,-7.79705 -0.85178,-3.97168 -1.49951,-5.04922 -3.03519,-5.04922 -1.07377,0 -3.05821,-0.72461 -4.40985,-1.61024 -3.20786,-2.10187 -7.29841,-1.12573 -7.85928,1.87547 -0.2297,1.22912 -0.87299,5.82525 -1.42954,10.21361 -0.89223,7.03524 -1.37869,8.30657 -4.11337,10.75 -2.27111,2.02924 -4.15072,2.77116 -7.02059,2.77116 -2.15551,0 -4.9673,0.39852 -6.2484,0.88559 -3.23144,1.22859 -13.48662,-0.52822 -17.47605,-2.99382 -2.32475,-1.43678 -4.29695,-4.2234 -6.86768,-9.70369 -1.98351,-4.22844 -4.10272,-8.58808 -4.70936,-9.68808 -2.70435,-4.9037 -3.82982,-7.44978 -6.26763,-14.17896 l -2.60076,-7.17896 -3.68972,2.51148 c -2.93735,1.99937 -4.45438,2.39029 -7.43972,1.91714 l -3.75,-0.59434 -0.0946,4.26182 c -0.41301,18.6163 -2.5116,27.11067 -7.90872,32.01182 -2.94796,2.67706 -3.34467,2.75 -14.95674,2.75 -11.05466,0 -12.12717,-0.17092 -14.64104,-2.33326 -2.34825,-2.01988 -2.91158,-3.66517 -4.19426,-12.25 -0.81492,-5.45421 -1.42333,-12.16674 -1.35201,-14.91674 0.37071,-14.29411 -0.22223,-20.53739 -1.58683,-16.70826 -0.37621,1.05565 -0.74548,1.05565 -2.02046,0 -0.85806,-0.71046 -2.5018,-1.34738 -3.65275,-1.41538 -1.15095,-0.068 -2.88014,-0.1805 -3.84264,-0.25 -0.9625,-0.0695 -1.78046,-0.91386 -1.81768,-1.87636 -0.0548,-1.41779 -0.269,-1.33336 -1.12818,0.44479 -1.32573,2.74371 -0.21968,6.57636 1.23434,4.27718 0.73167,-1.15695 0.93417,-0.97781 0.94621,0.83705 0.008,1.26996 -0.3837,2.06241 -0.87138,1.76101 -0.48768,-0.30141 -1.44879,0.12927 -2.13579,0.95706 -1.40557,1.6936 -0.60195,12.24848 1.05902,13.90945 0.5299,0.5299 0.95657,1.66096 0.94815,2.51346 -0.0135,1.3658 -0.13052,1.37174 -0.98469,0.05 -0.70322,-1.08815 -0.97358,-0.23159 -0.98469,3.11973 -0.0168,5.0629 -2.96463,15.34709 -5.51459,19.23883 -2.4893,3.79914 -7.1304,5.40717 -17.46658,6.05171 -12.49339,0.77906 -16.27405,-0.59548 -20.87829,-7.59078 -2.66712,-4.0522 -3.25188,-5.81357 -2.88837,-8.70016 0.25068,-1.99063 -0.15356,-8.34433 -0.8983,-14.11933 -1.3878,-10.76153 -2.69325,-75.46953 -2.36164,-117.06029 0.0946,-11.85816 -0.147,-23.68691 -0.53678,-26.28612 -0.69566,-4.639 -0.82604,-4.7807 -7.096,-7.71214 -5.87256,-2.74565 -6.60844,-2.87222 -9.13104,-1.57062 -4.27047,2.20346 -15.96075,4.85376 -18.23113,4.13317 -3.14411,-0.99791 -9.21376,1.42722 -12.22195,4.88327 -1.49015,1.712 -2.72765,3.62379 -2.75,4.24842 -0.0224,0.62463 -0.71287,2.42463 -1.53448,4 -1.89419,3.63195 -1.97668,15.48304 -0.15001,21.55259 2.49813,8.30066 7.31917,11.77799 19.77846,14.26583 3.35893,0.6707 11.52466,8.33505 12.33257,11.57535 0.33879,1.3588 0.48477,7.16004 0.3244,12.89166 -0.28012,10.01169 -0.39377,10.48315 -2.89255,12 -1.43053,0.86838 -3.68053,2.34171 -5,3.27407 -1.31946,0.93235 -5.43311,2.17794 -9.14143,2.76797 -8.59893,1.36819 -11.55493,2.74424 -13.34936,6.21429 -2.03143,3.92836 -2.33547,7.95059 -2.8212,37.32255 -0.37885,22.90893 -0.6809,26.79941 -2.54068,32.7241 -2.74598,8.74784 -7.17938,12.14847 -17.22509,13.21245 -10.94804,1.15955 -15.50971,0.005 -21.08512,-5.3345 -6.38105,-6.11157 -7.91513,-11.5481 -7.64768,-27.10205 0.10876,-6.325 0.19779,-13.525 0.19785,-16 10e-5,-4.39389 -1.10071,-55.53297 -1.28079,-59.5 -0.43076,-9.48924 -0.47233,-46.36658 -0.0832,-73.79902 0.30749,-21.67676 1.51379,-29.3993 5.21053,-33.35686 5.26216,-5.63344 5.71208,-5.69942 40.86713,-5.99328 32.64195,-0.27285 34.51754,-0.11814 41.66304,3.43671 2.73528,1.36079 3.8916,1.39882 8.55025,0.28123 2.96296,-0.7108 6.26459,-1.09753 7.33695,-0.85939 1.07237,0.23813 3.74976,-0.56835 5.94976,-1.79218 6.35351,-3.53437 11.26027,-3.87222 20.70015,-1.42529 8.41592,2.18151 13.82945,5.32635 15.9322,9.25538 1.79824,3.36005 4.86765,16.56319 4.86765,20.93835 0,2.91072 0.32476,3.72219 1.25,3.12337 0.6875,-0.44496 3.49251,-0.80902 6.23337,-0.80902 4.90728,0 5.0031,-0.0597 6.27607,-3.90837 0.71099,-2.1496 1.741,-7.0996 2.28891,-11 1.34449,-9.57086 1.36084,-9.60387 6.73491,-13.59163 l 4.71674,-3.5 11.5,0.0434 c 7.97707,0.0301 12.40357,0.48964 14.44953,1.5 4.35133,2.14883 10.90467,11.2808 15.13806,21.09462 3.66072,8.48626 3.78054,8.62976 6.8193,8.1673 1.70121,-0.2589 3.52061,-0.88351 4.04311,-1.38803 0.5225,-0.50452 2.12225,-0.91731 3.555,-0.91731 2.47121,0 2.67149,-0.39803 3.89967,-7.75 1.46452,-8.76671 2.89789,-12.45626 6.48448,-16.69121 3.35802,-3.96507 13.5482,-5.86196 21.11085,-3.92976 8.26298,2.11113 14.46525,11.11254 14.51365,21.06379 0.0202,4.15636 1.07826,7.36841 2.19898,6.67577 2.02122,-1.24919 9.78737,-0.97414 9.78737,0.34663 0,0.70663 0.4096,1.28478 0.91023,1.28478 0.50063,0 1.23237,-3.9375 1.62609,-8.75 0.70585,-8.62773 3.43009,-16.3961 6.63567,-18.9221 2.06794,-1.62954 7.56502,-2.57839 16.82801,-2.90468 10.63708,-0.3747 17.74426,2.33414 21.11551,8.04797 2.69622,4.56976 5.02274,5.7811 9.49272,4.94253 2.08993,-0.39207 5.18654,-0.14151 7.43924,0.60195 3.70824,1.22383 3.99817,1.15144 7.41929,-1.85234 1.95813,-1.71926 5.01666,-3.86361 6.79674,-4.76522 1.78007,-0.90161 3.96475,-2.27615 4.85484,-3.05453 4.247,-3.71403 13.70851,-8.46361 18.76433,-9.4195 11.38668,-2.15285 12.92154,-2.14996 20.31348,0.0383 14.27525,4.22584 20.02539,7.06338 25.30385,12.48673 6.4726,6.65027 8.84025,7.60612 17.22052,6.95213 10.59605,-0.82692 10.92371,-0.97688 13.83921,-6.33359 2.18624,-4.01685 3.62585,-5.33622 7.81027,-7.15793 6.81258,-2.96588 18.50518,-3.13718 23.63,-0.34617 2.98467,1.62547 5.58386,1.90143 17.653,1.87424 8.6537,-0.0195 14.6764,-0.45442 15.5,-1.11934 0.7409,-0.5981 2.7884,-1.39553 4.55,-1.77207 1.7617,-0.37654 4.3713,-1.60355 5.7992,-2.72671 2.278,-1.79186 3.4172,-1.95458 9.2969,-1.3279 7.0631,0.7528 10.2009,1.87538 10.2009,3.64954 0,1.70719 5.25,5.36832 7.2196,5.03465 1.0175,-0.17238 2.0842,0.48125 2.4643,1.51008 0.9988,2.70343 2.0741,3.10486 7.1748,2.67855 7.0972,-0.59317 24.3147,1.91013 25.218,3.66652 0.4155,0.80792 1.2323,3.04394 1.8151,4.96894 0.9965,3.29167 1.0386,3.17267 0.7067,-1.99925 -0.194,-3.02458 0.2293,-7.43357 0.9408,-9.79774 0.8286,-2.75292 0.9922,-5.34978 0.4552,-7.22228 -0.4612,-1.60807 -0.6247,-19.69909 -0.3633,-40.20225 0.5884,-46.16161 0.5874,-49.21087 -0.029,-86.77848 -0.6049,-36.87568 -1.1076,-41.89479 -3.9153,-39.08713 -1.4523,1.4523 -5.9903,1.38389 -7.4871,-0.11287 -0.66,-0.66 -1.2,-2.01857 -1.2,-3.01905 0,-1.45548 -0.5151,-1.68978 -2.577,-1.17226 -1.4174,0.35574 -3.5549,0.20661 -4.75,-0.3314 -5.8711,-2.64298 -9.7934,-3.4216 -16.6115,-3.29758 -4.0912,0.0744 -7.8161,0.36864 -8.2776,0.65382 -0.4614,0.28518 -2.8481,-0.81235 -5.3038,-2.43894 -4.2582,-2.82048 -4.9863,-2.9611 -15.7225,-3.03639 -6.1917,-0.0434 -16.8826,-0.18679 -23.7576,-0.3186 -6.875,-0.13182 -17,-0.1674 -22.5,-0.0791 -5.5,0.0883 -12.25,0.12464 -15,0.0807 -5.9479,-0.0951 -23.55343,-0.10529 -28.5,-0.0165 -20.40421,0.36611 -135.59223,1.16535 -139,0.96446 -8.63227,-0.50887 -58.29213,-0.27226 -75,0.35736 -10.31456,0.38869 -15.57182,0.2206 -29.5,-0.9432 -9.62925,-0.80459 -14.53586,-0.68903 -24.83574,0.58494 -10.64463,1.31661 -14.24424,1.38398 -21.08686,0.39464 -6.11679,-0.8844 -9.65134,-0.9096 -13.66426,-0.0974 -2.97723,0.60255 -13.96314,1.03135 -24.41314,0.9529 -74.46367,-0.55904 -147.97125,0.39964 -154.5,2.01498 -3.35658,0.83048 -7.21747,0.8058 -15.19474,-0.0971 -5.88211,-0.66577 -11.95711,-0.90806 -13.5,-0.53841 -1.54289,0.36964 -10.5503,1.03866 -20.01646,1.48671 -18.5653,0.87872 -20.0792,1.31608 -25.06482,7.24115 -1.32097,1.56989 -2.9844,2.85434 -3.69651,2.85434 -0.99324,0 -8.26875,6.98967 -8.59039,8.25288 -0.0346,0.13592 -0.42439,4.03378 -0.86618,8.66192 -0.71026,7.44055 -1.10422,8.63404 -3.40272,10.30838 -2.79694,2.03743 -4.54083,7.93523 -2.96801,10.03778 1.1014,1.47236 1.10427,26.705 0.003,28.44126 -0.4193,0.66122 -0.70267,4.26122 -0.6297,8 0.073,3.73878 0.10417,8.31731 0.0694,10.17452 -0.0348,1.85721 0.60224,4.66381 1.41571,6.23689 1.31502,2.54296 1.3033,3.27747 -0.10563,6.62326 -1.17818,2.79781 -1.42267,5.43047 -0.95313,10.26311 0.47192,4.8571 0.22606,7.463 -0.97274,10.31005 -1.35066,3.20771 -1.42356,4.72859 -0.46118,9.62031 0.83713,4.25504 0.84744,6.36272 0.0385,7.87421 -1.87047,3.495 -1.35374,14.28386 0.89541,18.69543 2.52586,4.95434 2.50756,6.52543 -0.12808,10.9925 -1.91696,3.24901 -2.01942,4.1479 -1.03277,9.06077 0.60242,2.99967 0.85918,6.0693 0.57057,6.8214 -0.28861,0.7521 0.17614,2.06833 1.03277,2.92496 1.87203,1.87203 2.03984,3.85068 0.30751,3.62572 -4.16556,-0.54092 -4.75,0.0351 -4.75,4.68164 0,3.49255 0.33179,4.47967 1.37158,4.08066 1.45073,-0.55669 5.62842,4.29514 5.62842,6.53667 0,0.71791 -0.81106,2.87363 -1.80235,4.79049 -0.99129,1.91685 -1.76407,4.16019 -1.71729,4.98519 0.32108,5.66255 2.00024,13.00769 3.61364,15.80716 2.72661,4.73102 2.43535,8.82592 -0.89778,12.62214 -2.66144,3.03121 -2.78941,3.62174 -2.52069,11.63201 0.38046,11.34151 1.67066,23.1348 2.71139,24.78404 0.48435,0.76754 0.40471,2.27075 -0.18544,3.5 -3.12125,6.50144 -3.68193,19.94497 -0.97468,23.37006 0.52837,0.66848 0.66175,2.9848 0.29638,5.14738 -0.42591,2.52097 -0.25865,4.18266 0.4661,4.63059 0.7763,0.47978 0.59362,1.09112 -0.58318,1.95163 -1.61031,1.17748 -1.6154,1.93324 -0.0844,12.53926 0.89604,6.20744 1.38241,11.6855 1.08084,12.17346 -0.30158,0.48797 0.18786,3.10365 1.08764,5.81264 1.13241,3.40937 1.33936,5.48013 0.67233,6.72754 -0.53,0.99115 -1.26069,5.91389 -1.62375,10.93943 -0.50548,6.99687 -0.28349,10.43287 0.94764,14.6678 0.89648,3.08379 1.71835,10.10144 1.85775,15.86267 0.14608,6.03698 0.78136,11.29866 1.52819,12.65705 0.75463,1.37259 1.04511,3.83023 0.70916,6 -0.54749,3.53613 -1.78789,22.68686 -1.71977,26.5518 0.0182,1.03216 0.95675,2.73719 2.08568,3.78896 1.12894,1.05176 2.05261,2.838 2.05261,3.96943 0,2.95864 -2.96131,12.72301 -4.06559,13.40548 -2.1958,1.35709 -0.4624,13.07434 2.35027,15.88701 2.12512,2.12512 2.9985,10.33008 1.3501,12.6835 -1.01854,1.45417 -1.26877,5.26778 -1.01503,15.46976 0.18522,7.4469 0.55894,13.89931 0.8305,14.3387 0.27155,0.43939 0.96097,7.78142 1.53203,16.31564 0.74532,11.13842 1.63244,17.17422 3.14396,21.39081 1.15813,3.23073 2.41027,9.02405 2.78255,12.87405 0.73193,7.5694 3.90494,13.87381 7.59121,15.08281 1.1,0.36078 4.475,1.82014 7.5,3.24304 5.50052,2.58732 6.21834,2.65662 20.5,1.97912 5.45311,-0.25868 35.87764,1.33692 36.5,1.91424 0.72877,0.67601 10.05112,-0.6762 12.05487,-1.74857 z m 844.62273,-176.9932 c 11.4907,-1.50211 11.8162,-1.62503 14.8562,-5.6106 2.0841,-2.73239 3.223,-6.03266 4.4949,-13.02467 1.4983,-8.23669 1.5542,-10.81698 0.4636,-21.41716 -1.1073,-10.76293 -1.5209,-12.34544 -3.8661,-14.79333 -1.4444,-1.50761 -2.6262,-3.24867 -2.6262,-3.86901 0,-1.6149 -3.8424,-2.92089 -9.2598,-3.14732 -1.5179,-0.0634 -3.5304,-1.01535 -4.4722,-2.11535 -0.9672,-1.1296 -2.95,-2 -4.556,-2 -1.5639,0 -3.8013,-0.5126 -4.9719,-1.13912 -1.2847,-0.68751 -8.6769,-1.23577 -18.6459,-1.38291 -19.0548,-0.28124 -21.8599,0.45834 -24.5749,6.47929 -0.9102,2.01844 -2.8156,4.54128 -4.2341,5.60631 -1.4186,1.06504 -5.2429,4.07393 -8.4985,6.68643 -3.2555,2.6125 -6.2808,4.75 -6.7229,4.75 -0.442,0 -1.0457,2.1375 -1.3415,4.75 -0.7689,6.79173 1.8653,14.42016 6.8476,19.83049 3.4086,3.70143 4.673,4.41951 7.7821,4.41951 4.0098,0 10.0808,2.17668 12.7118,4.5577 0.9003,0.81479 3.5704,1.67378 5.9336,1.90888 4.1557,0.41343 6.3679,1.60948 6.6276,3.58342 0.069,0.5225 0.1813,1.625 0.25,2.45 0.082,0.98139 1.2487,1.52782 3.375,1.58048 1.7875,0.0443 5.275,0.66049 7.75,1.36939 5.7581,1.64928 12.837,1.81396 22.6776,0.52757 z M 409.91347,471.41481 c -0.79004,-1.47619 -1.40539,-1.86255 -1.67557,-1.05202 -0.43908,1.31725 1.70056,4.60858 2.48562,3.82352 0.24119,-0.24118 -0.12334,-1.48836 -0.81005,-2.7715 z M 421,468.0765 c 0,-0.825 -0.42344,-1.5 -0.94098,-1.5 -1.26098,0 -2.1641,1.56159 -1.36517,2.36052 C 419.82004,470.0632 421,469.62291 421,468.0765 z m 231.74107,-4.57752 c 2.52742,-2.2191 4.14146,-2.9178 5.78653,-2.50491 2.13857,0.53675 2.26037,0.31034 1.94503,-3.61542 -0.27332,-3.40272 -1.03652,-4.77582 -4.0701,-7.32266 -2.05353,-1.72405 -3.48761,-3.54972 -3.18684,-4.05706 0.30077,-0.50734 -2.3501,-3.39743 -5.89082,-6.42243 C 639.16213,432.6027 627,420.66828 627,419.63216 c 0,-0.43444 -1.85313,-2.01623 -4.11807,-3.5151 l -4.11808,-2.72521 -4.27784,4.19838 c -2.35281,2.30911 -4.58986,4.10444 -4.97122,3.98963 -0.38136,-0.11481 -1.82173,0.77234 -3.20083,1.97145 -2.1871,1.90166 -2.40603,2.64942 -1.71356,5.8527 0.43664,2.01987 0.85523,5.47249 0.9302,7.67249 0.23618,6.93102 0.39685,7.41151 3.76084,11.24712 1.8103,2.06408 3.8363,5.01376 4.50224,6.55484 1.74314,4.03389 6.3313,5.62236 14.36947,4.97488 5.63831,-0.45417 7.10202,-0.22421 9.51659,1.49511 2.82209,2.00951 9.00927,4.98868 10.68824,5.14648 0.4774,0.0449 2.44528,-1.30331 4.37309,-2.99595 z m 55.96052,-56.88936 c 0.54332,-2.07767 3.61337,-3.57453 5.25299,-2.56119 0.53486,0.33056 1.88888,-0.31539 3.00895,-1.43546 1.53631,-1.53631 2.03647,-3.33816 2.03647,-7.33647 0,-6.31013 -1.12732,-7.7 -6.24545,-7.7 -2.73904,0 -4.54468,-0.69922 -6.27566,-2.4302 -1.99478,-1.99478 -3.56967,-2.47151 -8.78992,-2.66076 -7.03659,-0.2551 -8.68897,0.32277 -8.68897,3.03869 0,1.29853 -1.0137,2.01986 -3.49194,2.48478 -5.31289,0.99671 -5.61878,4.18711 -1.05995,11.05528 2.01234,3.03171 4.42224,5.54829 5.35534,5.59238 0.9331,0.0441 3.94655,0.88789 6.69655,1.87511 7.07581,2.54012 11.55022,2.56866 12.20159,0.0778 z M 409.0369,403.03204 c 0.8621,-1.03877 2.1807,-1.34702 4.02724,-0.94145 1.74765,0.38384 3.04407,0.12742 3.56708,-0.70554 1.62102,-2.5817 1.87242,-17.70491 0.32013,-19.2572 -0.6018,-0.6018 -0.95135,-0.36956 -0.95135,0.63207 0,0.93291 -1.12873,1.7992 -2.74745,2.10863 -2.54283,0.4861 -3.45894,-0.0628 -4.66016,-2.79205 -0.25905,-0.58857 -0.82075,-0.45911 -1.36523,0.31465 -1.04098,1.47931 -0.45383,5.92722 0.89224,6.75914 0.48433,0.29934 0.8806,1.89424 0.8806,3.54424 0,1.74536 -0.41821,2.74153 -1,2.38197 -0.55,-0.33992 -1,-1.79148 -1,-3.22568 0,-5.51289 -1.19008,-1.0861 -1.51773,5.64557 -0.35778,7.35057 0.69182,8.98512 3.55463,5.53565 z m 676.0412,-32.64635 c 4.2451,0.0283 4.6615,-0.20022 5.7251,-3.1415 0.6309,-1.7446 2.1707,-3.62103 3.4218,-4.16984 3.2812,-1.43929 4.565,-8.34607 4.679,-25.17112 0.094,-13.8543 0.038,-14.24252 -2.4929,-17.25 -1.4239,-1.6922 -3.3964,-3.07673 -4.3834,-3.07673 -0.9869,0 -2.019,-0.85857 -2.2934,-1.90792 -0.2744,-1.04936 -2.4313,-3.18686 -4.793,-4.75 -4.0015,-2.64833 -5.015,-2.84947 -14.8677,-2.95043 -8.6682,-0.0888 -11.2043,-0.4734 -14.0736,-2.13414 -6.3663,-3.68483 -22.8874,-3.64988 -27.7726,0.0588 -0.6999,0.53135 -1.0232,1.75185 -0.7184,2.71221 0.4335,1.36576 -0.988,2.52963 -6.5257,5.34292 -3.894,1.97823 -9.5672,5.74145 -12.6071,8.3627 -5.8077,5.0078 -12.3762,14.60042 -12.3762,18.07413 0,2.15597 4.3191,6.19177 6.6264,6.19177 0.7462,0 1.923,0.94322 2.6151,2.09603 1.4678,2.44469 11.3296,7.28269 14.2849,7.00788 1.3313,-0.1238 3.0464,1.19007 5,3.83019 1.6355,2.21024 3.3111,4.02926 3.7236,4.04226 0.4125,0.013 0.75,0.86215 0.75,1.887 0,1.48738 1.2611,2.11242 6.25,3.09775 3.4375,0.67892 7.375,1.6359 8.75,2.12662 1.375,0.49072 10.15,0.62194 19.5,0.29159 9.35,-0.33035 19.0601,-0.5869 21.5781,-0.57013 z m -1.0948,-189.70742 c 4.8468,-2.29973 6.0797,-3.55887 10.6202,-10.84635 l 5.1368,-8.24458 -0.1719,-17.63649 -0.1718,-17.63649 -2.864,-2.46346 c -2.5571,-2.19957 -3.441,-2.39135 -8.2511,-1.79036 -3.3215,0.41498 -5.8757,0.26772 -6.661,-0.38405 -0.8983,-0.74547 -2.1656,-0.72049 -4.2989,0.0847 -2.6219,0.98964 -3.7301,0.79059 -8.3128,-1.49304 l -5.2876,-2.63492 -2.927,2.46295 c -2.8171,2.3704 -3.0441,2.40239 -6.0435,0.85136 -1.8299,-0.94627 -6.5368,-1.78922 -11.4015,-2.04187 -10.2673,-0.53324 -16.2545,1.27404 -21.8492,6.59537 -4.1664,3.9628 -9.638,7.07542 -12.4378,7.07542 -0.8968,0 -3.9641,2.36292 -6.8162,5.25094 -5.0197,5.08282 -5.2067,5.47647 -5.8405,12.29559 -0.5681,6.11286 -0.3588,7.62471 1.5825,11.42996 2.3095,4.52696 5.6025,7.93207 7.7272,7.99024 0.6684,0.0183 2.7528,1.38327 4.632,3.03327 2.3895,2.09802 4.458,3 6.8798,3 2.193,0 4.1268,0.73346 5.273,2 0.9955,1.1 2.8087,2 4.0293,2 1.2206,0 4.1883,0.71008 6.595,1.57795 2.7252,0.98275 9.2793,1.77173 17.3757,2.09167 7.15,0.28255 13.1575,0.66751 13.3501,0.85548 1.265,1.23493 15.3705,-1.16347 20.1332,-3.42333 z M 305,112.19837 c 3.025,0.0541 8.875,0.23217 13,0.39564 4.125,0.16346 18.75,0.25489 32.5,0.20316 13.75,-0.0517 37.15,-0.0223 52,0.0654 14.85,0.0877 33.3,0.11433 41,0.0592 7.7,-0.0551 16.25,-0.0808 19,-0.0572 22.32895,0.19197 58.22815,-0.61012 63.67363,-1.42266 5.29685,-0.79036 7.25673,-0.70401 9.5,0.41855 2.17664,1.08922 4.55049,1.22578 10.32637,0.59403 6.38563,-0.69844 20.42595,-1.53009 31.5,-1.86583 1.65,-0.05 5.10159,0.19422 7.6702,0.54277 2.59541,0.35218 5.47508,0.18328 6.48192,-0.38017 1.31527,-0.73606 2.52162,-0.59454 4.40241,0.51647 2.38629,1.40962 2.92085,1.36193 6.77538,-0.6045 4.08943,-2.08628 4.34083,-2.09718 11.04495,-0.47906 4.76596,1.15033 8.5571,1.44382 12.41852,0.96136 l 5.55826,-0.69446 0.32418,-8.03591 c 0.1783,-4.419764 -0.0161,-8.244794 -0.43188,-8.500084 -0.41584,-0.25529 -2.44084,-0.38377 -4.5,-0.28551 -5.49665,0.26228 -11.82985,0.27111 -30.24394,0.0422 -11.82487,-0.14701 -17.63336,0.18297 -20.5,1.16459 -5.4154,1.85439 -26.02459,2.25044 -34.05417,0.65441 -4.74506,-0.94317 -8.1724,-1.01191 -13.17928,-0.26434 -4.11417,0.61428 -9.51044,0.67829 -13.76655,0.1633 -3.85,-0.46585 -11.95,-1.18669 -18,-1.60186 -6.05,-0.41517 -11.5152,-1.0799 -12.14488,-1.47718 -0.62969,-0.39728 -3.44,-0.28707 -6.24513,0.24491 -3.30851,0.62745 -7.64892,0.6206 -12.35512,-0.0195 -10.03651,-1.36506 -62.48889,-1.71937 -90.25487,-0.60966 -12.65,0.50558 -32.9,0.97556 -45,1.0444 -12.1,0.0688 -28.51936,0.74699 -36.48747,1.507 -11.48766,1.09571 -16.04302,1.13864 -22,0.20735 -4.13189,-0.64597 -11.33753,-1.10202 -16.01253,-1.01345 -4.675,0.0886 -11.68853,0.0479 -15.58562,-0.0903 -3.91918,-0.13901 -8.04095,0.25995 -9.22338,0.89277 -2.52873,1.35334 -7.45003,1.58729 -15.691,0.74592 -4.00522,-0.40892 -5.16884,-0.31843 -3.5,0.27218 2.12242,0.75113 1.7826,0.89981 -2.25,0.98444 -4.77748,0.10026 -6.92005,2.09968 -2.25,2.09968 2.25,0 2.5,0.4 2.5,4.000004 0,3.13439 0.37871,4.00481 1.75,4.02224 0.9625,0.0122 2.875,0.90222 4.25,1.97776 3.50418,2.74101 4,2.51789 4,-1.8 0,-4.09055 1.39258,-6.2 4.09301,-6.2 1.86334,0 2.90699,1.94831 2.90699,5.4268 0,1.24477 0.94674,3.12047 2.10387,4.16821 2.16675,1.96193 5.55329,2.23279 19.39613,1.55131 9.66211,-0.47566 33.36812,0.38783 34.21894,1.24642 0.42958,0.4335 4.15606,0.41526 8.28106,-0.0405 4.125,-0.4558 9.975,-0.78444 13,-0.73032 z m -90.67589,-2.0241 c 1.18139,-3.07866 -2.70858,-3.61641 -4.32411,-0.59777 -0.93377,1.74477 -0.76049,2 1.35783,2 1.3355,0 2.67033,-0.63101 2.96628,-1.40223 z"
+         id="path3119"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#2e3545"
+         d="m -27,966.3124 c 0,-0.1453 0.84726,-2.5078 1.8828,-5.25 2.12104,-5.6168 5.09478,-11.06 9.8672,-18.06107 l 3.25,-4.76772 -0.02,-16.07855 c -0.0323,-26.01563 -2.19591,-34.32109 -13.0454,-50.07856 -2.45063,-3.55922 -2.88382,-5.46477 -3.93112,-17.29256 -0.64735,-7.31091 -1.11099,-17.88591 -1.0303,-23.5 0.0807,-5.61409 -0.16266,-16.95744 -0.54076,-25.20744 -1.15456,-25.1921 1.57061,-37.82976 10.96691,-50.85777 2.10362,-2.91668 3.95532,-7.03366 4.63407,-10.30314 1.71433,-8.25789 1.00789,-33.60366 -1.12433,-40.33909 -0.95761,-3.025 -2.00779,-6.7188 -2.33372,-8.20844 -0.32593,-1.48965 -2.78128,-5.33841 -5.45632,-8.5528 -2.67505,-3.2144 -5.5487,-7.1706 -6.38588,-8.79156 -2.06902,-4.00604 -3.53301,-14.38287 -2.53906,-17.99701 1.11556,-4.05634 0.25355,-35.31065 -1.06714,-38.69151 -0.58897,-1.50772 -0.85897,-3.30772 -0.6,-4 0.46401,-1.24037 0.88918,-6.53937 2.2714,-28.30946 l 0.70164,-11.05079 5.91713,-8.12529 c 8.1887,-11.24458 9.88999,-15.91253 9.02888,-24.77314 -0.37416,-3.85 -0.59464,-12.196 -0.48996,-18.54666 0.22561,-13.68736 -1.20726,-18.52458 -8.17764,-27.60674 -7.69955,-10.03226 -8.029,-11.09243 -8.96434,-28.8466 -1.1702,-22.21223 -1.70547,-74.98459 -0.81984,-80.828 0.40246,-2.6554 1.5809,-5.87128 2.61876,-7.1464 10.91872,-13.41479 11.16348,-13.80048 11.9797,-18.87815 1.26912,-7.89503 0.7034,-45.22568 -0.72583,-47.89622 -0.65747,-1.22849 -3.29728,-4.75929 -5.86626,-7.84624 -2.56898,-3.08694 -5.8946,-8.66943 -7.39027,-12.40554 l -2.71939,-6.79293 -0.44887,-32.10326 c -0.24688,-17.65679 -0.68095,-34.18882 -0.9646,-36.73784 -0.28365,-2.54902 -0.0466,-5.8686 0.52687,-7.37685 0.57344,-1.50824 1.31978,-6.17268 1.65855,-10.36542 0.67147,-8.31045 2.02464,-11.79877 6.62467,-17.07752 6.43278,-7.38193 7.69124,-12.07013 8.36969,-31.17998 0.48836,-13.75545 0.29124,-18.92485 -0.94821,-24.86565 -2.15363,-10.32258 -2.97483,-12.15308 -7.78294,-17.34868 -5.76633,-6.23106 -7.88199,-12.734214 -8.50776,-26.151324 -0.96757,-20.74584 -1.16246,-62.002794 -0.34876,-73.831917 0.85091,-12.370039 2.40222,-17.151979 7.35377,-22.668083 5.71917,-6.371237 6.77593,-9.744703 7.90971,-25.25 l 1.07855,-14.75 506.59484,0 c 403.17366,0 507.14436,0.255187 509.28636,1.25 2.2831,1.060282 2.6928,1.876459 2.6994,5.377555 0,2.375386 -0.6017,4.633372 -1.4279,5.319098 -1.9685,1.633703 -2.9887,6.83706 -1.6555,8.443497 0.5972,0.719528 1.5382,3.69396 2.0912,6.60985 0.553,2.91589 1.5667,5.978461 2.2527,6.805713 1.6754,2.020295 7.0407,4.186944 10.4652,4.22609 1.5301,0.01749 3.6556,0.692492 4.7232,1.5 1.0677,0.807509 3.1152,1.468197 4.55,1.468197 1.4349,0 3.0364,0.421843 3.5589,0.937428 0.5225,0.515585 12.6526,1.168105 26.9557,1.450045 22.61,0.445683 27.0911,0.277073 34.3182,-1.291296 4.5718,-0.992153 8.9952,-2.486714 9.8297,-3.321246 0.8346,-0.834533 3.0499,-5.962792 4.9229,-11.396131 2.8563,-8.285419 3.4071,-11.290113 3.4146,-18.6288 l 0.01,-8.75 40.5796,0 40.5796,0 -0.6525,6.25 c -0.4796,4.593802 -0.244,7.215561 0.8894,9.89374 1.2299,2.90646 1.4168,5.978206 0.9236,15.181012 -0.4459,8.321112 -0.2404,12.880627 0.7372,16.356261 1.4475,5.146514 1.677,11.151282 1.006,26.318987 l -0.4203,9.5 3.6739,4 c 2.0207,2.2 3.6761,4.311778 3.6787,4.69284 0,0.381062 -0.893,2.214435 -1.9902,4.074162 -1.0973,1.859728 -2.2613,5.597948 -2.5866,8.307158 -0.3254,2.70921 -1.2949,6.72584 -2.1545,8.92584 -1.8676,4.77994 -1.8988,28.45672 -0.042,31.89657 0.6328,1.17223 1.2566,7.858624 1.409,15.103434 0.1504,7.15 0.3142,14.575 0.3638,16.5 0.05,1.925 -0.5137,11.375 -1.252,21 -0.7383,9.625 -1.246,21.03509 -1.1283,25.35576 0.1906,6.99394 0.5064,8.1609 2.8788,10.63714 2.2811,2.38096 2.4883,3.06381 1.4395,4.7433 -1.4467,2.31652 -0.4809,7.33115 1.3275,6.8924 0.6819,-0.16545 0.9023,-0.11206 0.4898,0.11863 -1.1118,0.62176 -0.9096,3.25277 0.25,3.25277 1.9013,0 0.9919,1.86774 -1.25,2.56739 -1.2375,0.3862 -2.5307,1.13861 -2.8737,1.67204 -0.9722,1.51187 0.05,16.96668 1.2149,18.3705 0.5724,0.68963 1.2604,5.22202 1.529,10.07197 0.2685,4.84996 0.9139,8.9681 1.434,9.15143 1.1499,0.40527 1.2948,34.16667 0.1467,34.16667 -0.9353,0 -3.2009,5.88376 -3.2009,8.31252 0,0.91879 0.9,2.23259 2,2.91955 2.542,1.58749 2.5311,3.28148 -0.039,6.03984 -2.9865,3.20559 -3.5435,6.64857 -1.6183,10.00293 0.9113,1.58798 1.657,3.52577 1.657,4.3062 0,0.78043 0.45,1.41896 1,1.41896 0.55,0 1,2.25 1,5 0,2.75 -0.378,5 -0.8399,5 -0.8084,0 -1.6647,2.44596 -4.164,11.89336 -0.9386,3.54775 -0.8638,5.76121 0.3886,11.5 0.853,3.90865 1.818,9.24414 2.1444,11.85664 0.3318,2.65542 1.1176,4.75675 1.7822,4.76531 0.8215,0.0106 0.8546,0.24227 0.1073,0.75 -1.4559,0.98909 -3.7386,12.2574 -3.6583,18.05815 0.2475,17.85325 1.7276,32.74203 3.3551,33.74785 1.2033,0.7437 1.1643,131.42869 -0.039,131.42869 -0.7844,0 -1.8728,10.42457 -1.9838,19 -0.072,5.60206 0.7277,10.44001 1.785,10.79244 0.8252,0.27506 1.1227,52.68574 1.1227,197.79089 l 0,197.41667 -609,0 c -334.95,0 -609,-0.1189 -609,-0.2641 z m 1121.6429,-32.37074 c 1.8949,-0.89917 4.1535,-3.03667 5.0192,-4.75 0.8657,-1.71334 2.7229,-4.64856 4.127,-6.52271 2.3068,-3.0789 2.5601,-4.33268 2.6264,-13 0.082,-10.73391 -1.8265,-24.96368 -3.9895,-29.74358 -0.7843,-1.73312 -1.426,-4.01718 -1.426,-5.07569 0,-3.09242 -4.2235,-6.20913 -11.962,-8.82725 -6.7805,-2.29399 -8.6858,-2.45313 -31.8748,-2.66221 -24.6491,-0.22225 -38.9998,0.94112 -43.6934,3.54212 -2.7084,1.50087 -9.4698,9.05275 -9.4698,10.57691 0,1.92997 -3.9951,13.16016 -5.4974,15.45305 -1.0579,1.61472 -1.1759,3.13195 -0.4776,6.1442 0.51,2.2 0.938,5.5975 0.9511,7.55 0.025,3.72152 1.4593,5.95 3.8295,5.95 0.7731,0 2.7509,1.13193 4.3951,2.5154 2.5665,2.15957 3.9308,2.50465 9.6443,2.43941 7.0377,-0.0804 19.3037,1.98038 22.6568,3.80642 4.7047,2.56207 10.4506,4.05034 16.2685,4.21377 3.4263,0.0962 7.5657,0.25375 9.1986,0.35 2.7671,0.16311 5.8621,2.45947 10.2811,7.62813 1.4585,1.70592 2.9325,2.04687 8.8489,2.04687 4.4988,0 8.3607,-0.59879 10.544,-1.63484 z M 89,866.06292 c 32.92918,-0.73302 47.92325,-1.4605 52.8138,-2.56241 3.07636,-0.69314 9.66734,-0.77557 19.1862,-0.23993 7.975,0.44875 15.625,0.7401 17,0.64742 1.375,-0.0927 21.175,-0.40494 44,-0.69393 83.42318,-1.05625 108.74658,-1.62847 120.5,-2.7229 7.49797,-0.69818 13.87585,-0.78514 17,-0.23178 3.07867,0.5453 18.64141,0.37933 40.5,-0.43191 19.525,-0.72464 50.35,-1.5018 68.5,-1.72704 18.15,-0.22524 50.775,-0.7785 72.5,-1.22947 21.725,-0.45097 42.2,-0.55982 45.5,-0.24189 3.3,0.31793 7.8,0.18531 10,-0.29471 2.2,-0.48002 19.06166,-1.06744 37.47036,-1.30537 18.40869,-0.23793 35.95869,-0.90959 39,-1.49257 3.21613,-0.61649 26.86715,-1.25454 56.52964,-1.52504 28.05,-0.25579 55.725,-0.6719 61.5,-0.92469 5.775,-0.25279 20.175,-0.64185 32,-0.86458 24.425,-0.46005 36.3867,-1.79661 39.3094,-4.39233 1.0857,-0.96431 3.0214,-3.99435 4.3015,-6.73343 2.0881,-4.46806 2.1765,-5.18783 0.8592,-7 -0.8075,-1.11092 -2.5973,-4.14972 -3.9774,-6.75288 -1.5849,-2.98962 -3.3349,-4.90333 -4.7509,-5.1954 -9.7668,-2.01449 -31.547,-2.87624 -38.9172,-1.53978 -4.9983,0.90636 -7.1384,0.79326 -12.855,-0.67936 -6.087,-1.56805 -7.7362,-1.62161 -14.664,-0.47626 -13.9892,2.31282 -15.4019,2.36899 -22.1448,0.88049 -6.06976,-1.33993 -13.5368,-1.47167 -31.1608,-0.54976 -2.475,0.12947 -10.125,0.11396 -17,-0.0345 -6.875,-0.14842 -24.875,0.20806 -40,0.79218 -41.80354,1.61441 -58.25046,2.12897 -61,1.90845 -4.53042,-0.36335 -22.34589,-0.2814 -31,0.1426 -4.675,0.22905 -12.15327,0.0321 -16.61837,-0.43768 -5.35055,-0.56293 -10.29409,-0.46961 -14.5,0.27373 -6.66608,1.17815 -74.08907,2.67299 -100.88163,2.23667 -10.04546,-0.16359 -18.84311,0.27273 -25,1.23988 -7.00198,1.0999 -12.52392,1.29454 -21,0.74021 -11.70212,-0.76532 -34.45529,0.0182 -57,1.96278 -7.99857,0.68992 -14.60653,0.74726 -18.3496,0.15923 -3.57979,-0.56238 -9.0122,-0.55663 -14,0.0148 -4.48272,0.51358 -11.0754,1.10107 -14.6504,1.30554 -3.575,0.20447 -13.925,0.79899 -23,1.32116 -9.075,0.52217 -18.75,0.59804 -21.5,0.1686 -2.75,-0.42943 -5.40463,-0.5372 -5.89918,-0.23949 -1.31792,0.79338 -26.10556,2.60072 -33.10082,2.41348 -3.3,-0.0883 -8.25,0.26649 -11,0.78848 -2.75,0.52199 -16.87115,1.20352 -31.38033,1.51452 -14.50918,0.311 -26.83787,0.84823 -27.39708,1.19384 -0.55921,0.34561 -8.71307,0.7673 -18.11967,0.93709 -19.89067,0.35902 -26.22715,0.82497 -33.10292,2.43422 -2.75,0.64363 -11.3,1.26722 -19,1.38576 -13.36168,0.2057 -21.5,1.58695 -21.5,3.64903 0,0.50735 -0.43588,0.92245 -0.96862,0.92245 -0.53273,0 -0.68603,-0.7364 -0.34065,-1.63645 0.40982,-1.06796 0.18481,-1.48873 -0.6477,-1.21123 -0.70162,0.23388 -2.26321,2.88189 -3.4702,5.88448 -1.43967,3.58144 -2.86153,5.58304 -4.13367,5.81914 C 50.92178,853.89958 48,857.0164 48,859.23463 c 0,1.35474 0.26667,1.47514 1.2,0.54181 1.25524,-1.25524 5.03598,-1.63069 6.06443,-0.60223 0.32877,0.32877 0.35122,1.24025 0.0499,2.02552 -0.42862,1.11695 -0.85822,1.1702 -1.97348,0.24462 -1.00801,-0.83657 -1.73743,-0.87132 -2.49012,-0.11863 -1.6322,1.6322 3.46424,4.48555 8.963,5.01812 2.57745,0.24964 4.86559,0.6209 5.08474,0.82503 0.21915,0.20414 1.34415,0.13646 2.5,-0.15039 1.15585,-0.28684 10.87654,-0.71687 21.60154,-0.95562 z m 160,-76.20841 c 0.825,-0.36181 17.475,-0.72884 37,-0.81564 19.525,-0.0868 47.425,-0.70485 62,-1.37345 14.575,-0.6686 36.2221,-1.37158 48.10467,-1.56217 11.88257,-0.19059 24.03257,-0.59986 27,-0.90948 8.43355,-0.87998 47.38636,-1.87524 120.39533,-3.07616 12.65,-0.20807 25.025,-0.83239 27.5,-1.38738 2.71466,-0.60872 9.07322,-0.72137 16.02695,-0.28395 6.33983,0.3988 17.58983,0.35961 25,-0.0871 7.41018,-0.44671 22.47305,-1.01817 33.47305,-1.26993 11,-0.25175 26.975,-1.21555 35.5,-2.14177 17.72532,-1.92582 30.37265,-2.02298 54.5,-0.41869 14.20902,0.9448 20.15675,0.86517 36.228,-0.48498 10.5753,-0.88844 27.9003,-1.72741 38.5,-1.86438 11.8076,-0.15257 20.0466,-0.67983 21.272,-1.36131 5.3214,-2.95941 8.6631,-3.30393 12.0062,-1.23778 3.7156,2.29637 8.738,2.61173 10.3654,0.65084 2.319,-2.79422 2.3714,-7.04178 0.1167,-9.44916 -1.7423,-1.86017 -2.0263,-3.02109 -1.5005,-6.13335 0.5911,-3.49895 0.3687,-4.03814 -2.5116,-6.08915 -2.321,-1.6527 -5.4594,-2.48776 -11.8182,-3.14463 -4.7619,-0.49191 -9.5852,-0.66961 -10.7184,-0.39491 -1.1333,0.27471 -9.2333,0.77743 -18,1.11715 -8.7668,0.33973 -16.0687,0.74415 -16.2264,0.8987 -0.1578,0.15455 -3.2667,-0.34363 -6.9087,-1.10706 -5.3044,-1.11188 -8.7292,-1.17087 -17.2132,-0.2965 -5.82521,0.60036 -20.9413,0.98072 -33.5913,0.84524 -29.08646,-0.3115 -30.80688,-0.28791 -43.5,0.59664 -5.775,0.40245 -23.55,0.86393 -39.5,1.02552 -15.95,0.16158 -38.225,0.76856 -49.5,1.34884 -12.48443,0.64252 -25.38754,0.72364 -33,0.20746 -7.37391,-0.5 -16.80591,-0.46003 -23,0.0975 -5.775,0.51978 -33.9,1.17565 -62.5,1.4575 -49.40123,0.48683 -57.42102,0.67413 -81,1.89175 -5.5,0.28402 -21.025,0.64631 -34.5,0.80508 -13.475,0.15877 -33.67833,0.85945 -44.89629,1.55707 -11.21796,0.69762 -21.34117,1.02131 -22.49601,0.71931 -1.15485,-0.302 -16.05152,-0.0733 -33.10371,0.50828 -28.14149,0.95974 -71.11706,2.24812 -106.50399,3.19291 -7.425,0.19824 -15.23366,0.93498 -17.35258,1.6372 -2.15866,0.71539 -5.51739,1.01055 -7.63898,0.67129 -2.79799,-0.44742 -5.18588,0.0151 -9.14743,1.77179 -7.31785,3.24498 -9.23825,5.48844 -7.84191,9.1611 0.90054,2.36861 0.73469,3.29151 -1.01736,5.66128 -1.15131,1.55724 -1.80541,3.29714 -1.45356,3.86645 0.35185,0.5693 2.95995,2.08769 5.79578,3.37417 5.09874,2.31308 5.58337,2.34066 43.61125,2.48202 21.15037,0.0786 38.62268,0.3104 38.82736,0.51508 0.63581,0.63582 41.63023,-0.47517 43.21743,-1.17122 z m 830.1479,-43.94959 c 2.4959,0.65269 7.3454,-1.56559 8.1806,-3.74197 0.3139,-0.81814 2.8401,-2.46376 5.6137,-3.65693 6.5179,-2.80394 8.7797,-6.50531 10.2847,-16.83107 0.9671,-6.63586 0.9292,-8.76186 -0.2114,-11.84308 -0.7875,-2.12736 -1.2794,-6.49591 -1.1348,-10.07703 0.3037,-7.51746 -1.1127,-10.23573 -6.8619,-13.16874 -2.1736,-1.10887 -4.4344,-2.91764 -5.0241,-4.01948 -0.8495,-1.58727 -1.9892,-1.96866 -5.4877,-1.83633 -2.4285,0.0919 -5.076,-0.38109 -5.8831,-1.051 -2.9042,-2.41025 -44.6919,-3.43474 -46.975,-1.15167 -0.5769,0.57689 -1.8276,1.04888 -2.7793,1.04888 -2.1799,0 -2.903,4.09651 -0.9866,5.58949 2.1958,1.71069 -7.8625,1.53828 -10.311,-0.17674 -2.8312,-1.98302 -3.1153,-1.82909 -3.3909,1.83725 -0.1344,1.7875 -1.8051,6.4553 -3.7127,10.37289 -1.9076,3.91758 -3.4684,7.79998 -3.4684,8.62755 0,0.82757 -0.675,2.06487 -1.5,2.74956 -2.0804,1.72662 -1.8743,5.22552 0.6206,10.53318 3.1936,6.79418 5.4101,8.06606 15.2686,8.76179 4.6793,0.33022 9.8586,1.29895 11.5096,2.15272 1.6511,0.85377 4.6595,1.55231 6.6855,1.55231 4.7018,0 11.4249,2.00438 13.3917,3.9925 0.8382,0.84728 2.3157,2.76122 3.2834,4.25319 2.5152,3.87793 7.053,5.97393 11.2349,5.1894 2.5056,-0.47005 3.8834,-0.20023 5.0781,0.99443 1.2638,1.26385 1.9577,1.37543 3.0282,0.48697 0.7638,-0.63389 2.3601,-0.89853 3.5473,-0.58807 z M 234.18883,737.4399 c 1.88874,-0.74133 4.16181,-0.73947 7.639,0.006 3.38505,0.72596 6.80328,0.74609 10.81117,0.0637 3.22355,-0.54887 13.286,-0.93515 22.361,-0.8584 9.075,0.0767 17.625,0.11881 19,0.0935 1.375,-0.0253 20.275,-0.24778 42,-0.49436 21.725,-0.24657 43.86854,-0.71605 49.20786,-1.0433 5.33932,-0.32724 11.92336,-0.17482 14.63119,0.33871 3.27203,0.62052 8.06567,0.54335 14.29214,-0.2301 5.15285,-0.64008 21.06881,-1.24622 35.36881,-1.34696 87.12825,-0.61386 124.75538,-1.26881 131.5,-2.28894 7.84107,-1.18598 69.99999,-0.87176 73.12608,0.36965 0.89434,0.35516 6.42642,-0.067 12.2935,-0.93822 7.44322,-1.10521 22.06412,-1.7729 48.37392,-2.2091 43.37921,-0.71918 44.82922,-0.72516 52.2065,-0.2152 3.025,0.20911 11.1784,-0.19538 18.1188,-0.89886 8.2707,-0.83832 14.1284,-0.96563 17,-0.36946 4.6487,0.96512 30.5434,0.77114 47.6175,-0.35671 7.6709,-0.50671 10.8214,-1.13643 12.571,-2.51267 4.9322,-3.87965 7.8283,-21.5281 7.002,-42.66917 -0.4305,-11.01555 -0.2272,-13.95195 1.2307,-17.76925 1.6435,-4.30352 1.6483,-4.94015 0.081,-10.80374 -1.8131,-6.78246 -2.0556,-17.74846 -1.1878,-53.73075 0.3463,-14.36051 0.018,-25.79228 -1.0975,-38.17113 -0.9008,-10.00009 -1.2479,-18.89914 -0.7996,-20.5 0.4358,-1.55588 0.6604,-3.27887 0.4993,-3.82887 -0.1612,-0.55 -0.2473,-3.44179 -0.1914,-6.42619 0.072,-3.83819 -0.4905,-6.38432 -1.9217,-8.70009 l -2.0234,-3.27389 -6.6281,0.54881 c -3.6454,0.30184 -9.3601,1.47095 -12.6993,2.59803 -3.4177,1.15357 -9.0751,2.11914 -12.9442,2.2092 -4.8712,0.11338 -7.2012,0.60596 -8,1.69129 -1.5912,2.16201 -5.7155,3.01359 -16.5293,3.41297 -9.5589,0.35304 -11.799,-0.17591 -15.6809,-3.70267 -2.0459,-1.85875 -2.1679,-1.8551 -6.8233,0.2042 -4.4748,1.97941 -4.9612,2.00839 -8.6871,0.51758 -5.5095,-2.20449 -8.95307,-1.9813 -15.62789,1.01288 -5.20641,2.33548 -6.57055,2.53116 -13.77851,1.9765 -5.75272,-0.44268 -8.70228,-1.16825 -10.5,-2.58293 -1.375,-1.08202 -3.9275,-2.60886 -5.67222,-3.39298 -1.74472,-0.78411 -3.93397,-2.58825 -4.86501,-4.00918 -1.30455,-1.99101 -2.52646,-2.58494 -5.32778,-2.58969 -1.99924,-0.003 -4.92393,-0.67839 -6.4993,-1.5 -1.57537,-0.82161 -3.37537,-1.48768 -4,-1.48016 -0.62463,0.008 -4.06028,2.68973 -7.63478,5.96045 -3.5745,3.27072 -8.0745,6.59597 -10,7.38943 -7.75595,3.19609 -19.54121,5.8405 -27.98334,6.27897 -8.55335,0.44425 -9.28915,0.30885 -17.72073,-3.26112 -14.60388,-6.18336 -27.28218,-16.85646 -27.2931,-22.97642 -0.002,-1.15226 -0.93818,-2.94067 -2.08028,-3.97426 -2.03768,-1.84407 -2.10786,-1.83853 -3.75,0.29581 -1.24668,1.62036 -2.9463,2.25136 -6.66447,2.47426 -3.54139,0.2123 -5.03971,0.73487 -5.15871,1.7992 -1.0077,9.01268 -2.9289,16.19496 -4.80296,17.95554 -3.56493,3.34908 -13.05236,6.04446 -21.2758,6.04446 -6.11253,0 -8.16756,-0.44081 -11.69654,-2.50893 -2.35464,-1.37991 -5.05182,-3.36049 -5.99373,-4.40129 -3.14593,-3.47621 -4.69039,-13.5838 -4.75059,-31.08978 -0.10397,-30.23541 -0.47822,-41.47776 -1.46471,-44 -0.58203,-1.48812 -0.79484,-11.20215 -0.52578,-24 0.24861,-11.825 0.49878,-24.2 0.55593,-27.5 0.0571,-3.3 -0.23381,-17.475 -0.64657,-31.5 -1.33942,-45.51213 1.37656,-52.10554 21.66776,-52.6015 12.78681,-0.31254 17.04998,1.60953 22.65657,10.21486 2.86494,4.39728 5.0018,6.60599 6.80172,7.03041 1.44343,0.34035 4.06908,1.69404 5.83478,3.00819 l 3.21037,2.38936 3.91434,-4.27066 c 2.15289,-2.34886 5.16189,-5.76425 6.68667,-7.58975 3.7947,-4.54311 20.18515,-15.04433 24.47826,-15.68302 1.925,-0.28638 5.41896,-0.96556 7.76435,-1.50929 5.87869,-1.36285 9.87636,-1.23822 13.58452,0.42351 1.73312,0.77666 4.72613,1.67663 6.65113,1.99994 5.98348,1.00495 15.35372,6.05595 18.51898,9.98261 1.63956,2.03395 5.44963,6.17696 8.46682,9.20669 4.23172,4.24931 5.94624,5.35997 7.5,4.85848 7.83211,-2.5279 11.11957,-3.13864 12.20575,-2.26755 0.85847,0.68847 1.48777,-0.11332 2.25126,-2.86835 1.4532,-5.24381 5.05318,-11.26493 8.05719,-13.47597 3.28352,-2.41678 13.2864,-4.20028 19.17578,-3.41903 5.35872,0.71086 12.23515,3.53327 16.19259,6.64619 2.45952,1.93466 3.01243,2.00858 5.92223,0.79169 1.7652,-0.73821 5.4594,-1.20492 8.2094,-1.03714 4.1422,0.25271 6.1705,-0.30699 11.8227,-3.26231 5.5163,-2.8843 7.9228,-3.56736 12.5685,-3.56736 8.5025,0 15.5592,2.43812 19.9132,6.88013 2.0326,2.0737 6.1064,5.07182 9.053,6.6625 2.9466,1.59067 5.7212,3.84904 6.1659,5.01859 0.8344,2.19473 4.9889,4.41334 8.8021,4.70058 1.5512,0.11685 2.1746,0.81948 2.1746,2.451 0,1.3664 0.6039,2.2872 1.5,2.2872 0.9333,0 1.5,-0.94444 1.5,-2.5 0,-1.55556 0.5667,-2.5 1.5,-2.5 1.008,0 1.5,1.00815 1.5,3.07332 0,2.39841 0.3843,2.99372 1.75,2.71082 1.1643,-0.24118 1.6961,-1.20327 1.589,-2.8745 -0.1097,-1.71082 0.5282,-2.81461 2,-3.46082 1.8989,-0.83376 2.1761,-1.79771 2.2858,-7.94882 0.069,-3.85 0.6084,-8.2071 1.1995,-9.68245 0.6756,-1.68609 0.7511,-3.81128 0.2032,-5.72152 -0.4793,-1.67149 -0.6577,-19.81439 -0.3963,-40.31755 0.5892,-46.22811 0.588,-49.26544 -0.035,-86.77848 -0.6386,-38.42555 -0.7934,-39.6974 -5.1124,-42.00887 -1.3659,-0.731 -2.5396,-2.15305 -2.6084,-3.16011 -0.069,-1.00706 -0.1812,-2.38746 -0.25,-3.06755 -0.2078,-2.05607 -4.9946,-3.73094 -13.7858,-4.82363 -4.5866,-0.57007 -10.5946,-1.51093 -13.3512,-2.09079 -3.4883,-0.73377 -6.2245,-0.73752 -9,-0.0123 -3.8898,1.0163 -25.2034,1.75882 -34.488,1.20149 -5.3129,-0.31892 -81.39319,0.90913 -98,1.58187 -9.625,0.3899 -20.65,0.52239 -24.5,0.29442 -3.85,-0.22797 -21.175,-0.32926 -38.5,-0.2251 -17.325,0.10417 -38.025,0.22945 -46,0.2784 -7.975,0.0489 -20.35,-0.01 -27.5,-0.12996 -7.15,-0.12044 -26.95,-0.0839 -44,0.0812 -17.05,0.16511 -36.625,-0.12568 -43.5,-0.64619 -7.70474,-0.58333 -13.65086,-0.59064 -15.5,-0.0191 -1.65,0.51002 -15.375,1.17544 -30.5,1.47872 -34.63615,0.69449 -36.6279,0.71216 -53,0.47014 -7.425,-0.10976 -14.4,-0.15932 -15.5,-0.11013 -1.1,0.0492 -9.2,0.0452 -18,-0.009 -14.36454,-0.0881 -39.35915,0.32648 -78.5,1.3022 -7.425,0.18509 -14.58967,-0.0692 -15.9215,-0.56517 -1.63999,-0.61069 -4.51569,-0.3765 -8.91039,0.72565 -5.52738,1.38621 -7.92662,1.46021 -16.19146,0.49937 -7.19077,-0.83597 -11.48548,-0.83687 -16.58961,-0.003 -3.78787,0.61849 -10.26204,0.856 -14.38704,0.52781 -10.57217,-0.84114 -22.21461,0.66689 -25.57886,3.31321 -1.47997,1.16415 -4.11517,2.11663 -5.856,2.11663 -3.48403,0 -5.56514,1.51265 -5.56514,4.04501 0,0.90476 -0.94607,2.5012 -2.10238,3.54764 -2.93205,2.65347 -4.89762,6.77467 -4.89762,10.2688 0,2.10203 -0.92632,3.74021 -3.19378,5.64815 -3.15861,2.6578 -3.19657,2.79733 -3.44751,12.67319 -0.14336,5.64207 -0.75134,10.58537 -1.39766,11.36415 -1.98373,2.39024 -2.42499,12.81035 -0.65841,15.54776 1.51488,2.34739 1.66192,9.40054 0.39412,18.9053 -0.25677,1.925 -0.0626,5.43084 0.43156,7.79076 0.63244,3.02047 0.53668,4.94481 -0.32347,6.5 -1.04233,1.88458 -1.61097,8.30518 -1.96697,22.20924 -0.0422,1.65 0.37964,7.05 0.93753,12 0.55788,4.95 0.68607,9.45 0.28487,10 -0.40121,0.55 -0.54421,3.475 -0.31778,6.5 1.39119,18.58537 1.43708,22 0.29568,22 -0.80065,0 -1.13748,2.30388 -1.05997,7.25 0.0625,3.9875 0.10717,12.09558 0.0993,18.01795 -0.008,5.92236 0.32597,11.77236 0.7419,13 0.41594,1.22763 0.59776,6.95705 0.40404,12.73205 -0.53335,15.90011 -0.26541,24.55922 0.92136,29.77598 1.89069,8.31103 2.44982,32.39037 0.98622,42.47213 -0.58043,3.99821 -0.63457,9.18938 -0.13285,12.73885 0.52265,3.69762 0.46128,7.38691 -0.16033,9.63822 -0.55392,2.00611 -0.7445,6.17363 -0.42352,9.26115 0.74928,7.20729 1.11,20.07771 0.75993,27.11367 -0.1505,3.025 0.36253,11.34159 1.14007,18.48131 0.99176,9.1067 1.10343,13.47818 0.37412,14.64598 -0.76349,1.22255 -0.53275,2.95385 0.86877,6.51869 1.96518,4.99851 2.07598,11.83203 0.22851,14.09306 -1.26659,1.55012 -0.14576,7.96176 1.49595,8.55753 0.94829,0.34412 0.95398,0.89103 0.0257,2.46737 -0.89383,1.51783 -0.95285,5.19319 -0.23556,14.66942 0.72869,9.62678 0.6643,13.17186 -0.26981,14.85541 -0.67478,1.21618 -1.07748,2.66123 -0.89489,3.21123 0.1826,0.55 0.46048,5.33538 0.61752,10.63418 0.15703,5.29881 0.76301,12.04881 1.34663,15 0.58361,2.9512 1.33843,7.38131 1.67737,9.84469 0.33894,2.46338 0.87915,4.90425 1.20047,5.42414 0.84183,1.36213 2.24518,33.12162 2.32408,52.59699 0.031,7.66136 1.27151,14.07993 4.44503,23 1.27189,3.575 2.60617,8.75 2.96507,11.5 0.92196,7.06436 6.37237,15.11755 11.83406,17.48527 6.3272,2.74293 17.6335,4.36413 21.13946,3.03116 2.91183,-1.10707 21.38023,-0.59072 36.04322,1.00773 7.59642,0.8281 12.48856,0.48783 16.68883,-1.16076 z M 270.3827,533.54891 c -5.28483,-1.62891 -10.99977,-8.81116 -12.40842,-15.5943 -1.29109,-6.21706 -1.33676,-7.42085 -1.26621,-33.37811 0.0381,-14.00915 -0.11671,-25.20631 -0.78797,-57 -0.1848,-8.75315 -0.20067,-21.91817 -0.0711,-58.96202 0.10924,-31.22128 0.39437,-38.25473 1.71158,-42.22049 1.62526,-4.89319 5.86907,-9.39247 9.76645,-10.35437 4.75449,-1.17343 27.55876,-1.97585 33.71658,-1.18639 3.59901,0.46141 12.02916,0.46821 18.73367,0.0151 10.47337,-0.70782 12.91988,-0.57574 17.37286,0.93787 2.85056,0.96894 5.89541,2.39012 6.76633,3.15819 0.87092,0.76807 4.1843,2.20638 7.36308,3.19625 l 5.77959,1.79976 2.9692,-3.60216 c 3.5516,-4.30871 10.3005,-7.79067 15.03734,-7.7582 4.38801,0.0301 17.5966,3.52518 20.49211,5.4224 3.46424,2.26985 6.43391,7.88918 7.52552,14.24007 1.42669,8.3004 2.14731,49.8878 1.07908,62.27441 -0.5746,6.66267 -0.54613,11.56396 0.0784,13.5 0.58877,1.82516 0.97977,23.61572 0.97864,54.53958 -0.002,58.04267 -0.21711,60.1567 -6.69615,65.84537 -3.05459,2.68197 -4.26512,3.02359 -13.04674,3.68198 -12.64013,0.94767 -16.34045,-0.21167 -21.01925,-6.58547 -3.19306,-4.34981 -3.4597,-5.2729 -3.48822,-12.07586 -0.017,-4.05131 -0.48649,-10.74102 -1.04335,-14.86602 -0.55687,-4.125 -1.20695,-26.625 -1.44462,-50 -1.02456,-100.76447 -0.87163,-94.83101 -2.48115,-96.26779 -0.825,-0.73646 -3.90082,-2.16146 -6.83516,-3.16666 -5.25602,-1.80055 -5.40434,-1.79677 -10,0.2548 -5.86533,2.61836 -14.24282,4.30804 -17.87999,3.60626 -6.56041,-1.2658 -15.58671,5.66028 -17.3669,13.32602 -0.47863,2.06106 -0.87024,6.89737 -0.87024,10.74737 0,14.55517 3.58957,21.18078 13.24096,24.44011 3.35482,1.13294 6.85042,2.05989 7.768,2.05989 2.123,0 8.85282,5.31761 11.16305,8.82057 1.39277,2.11183 1.7685,4.80588 1.77369,12.71767 l 0.007,10.03824 -4.50461,3.76539 c -4.86662,4.06798 -7.50879,5.17972 -14.52796,6.11288 -5.7855,0.76916 -10.42622,3.59799 -12.50858,7.62482 -1.34094,2.59309 -1.63817,6.45753 -1.63785,21.29422 2.1e-4,9.96942 0.11325,19.25121 0.25121,20.62621 0.51618,5.14483 -1.28273,20.73086 -3.12817,27.103 -1.63944,5.66081 -2.49774,7.00871 -6.01501,9.44618 -3.62374,2.51126 -5.11403,2.87474 -12.76586,3.11361 -4.76474,0.14875 -10.06595,-0.16192 -11.78047,-0.69038 z m 237.18159,-4.07806 c -7.11449,-1.69969 -10.35546,-5.19992 -16.06399,-17.34901 -2.88314,-6.13602 -5.56097,-12.25641 -5.95073,-13.60087 -1.52455,-5.2589 -5.07446,-13.56095 -6.76852,-15.82933 C 477.80147,481.37997 477,479.05427 477,477.52343 c 0,-4.1445 -0.93411,-5.8615 -4.07152,-7.48392 -8.23263,-4.25725 -15.25149,1.57549 -11.80057,9.8064 0.95359,2.27446 1.34508,7.96599 1.32275,19.23059 -0.0359,18.09779 -1.26493,22.6416 -7.55631,27.93544 -3.27571,2.75634 -3.52038,2.79888 -13.53481,2.35349 -11.0615,-0.49196 -14.97908,-1.99653 -15.757,-6.05158 -1.14945,-5.99174 -2.81744,-21.52418 -2.5491,-23.73735 0.74079,-6.10967 -0.66205,-57.45993 -1.83264,-67.08301 -0.50734,-4.17066 -0.62822,-11.37066 -0.26862,-16 0.78354,-10.08691 0.41012,-34.66621 -0.78875,-51.91699 -0.7406,-10.65669 -0.59297,-13.82482 1.00113,-21.48398 1.02842,-4.94118 1.67721,-9.48596 1.44178,-10.09951 -0.23544,-0.61354 0.0182,-3.20793 0.56363,-5.76531 0.79409,-3.72328 1.89385,-5.38902 5.5193,-8.35981 3.7949,-3.10963 5.5499,-3.81584 10.84458,-4.36386 6.08534,-0.62986 18.65216,0.83333 21.32038,2.48238 1.70552,1.05407 10.14421,12.72482 10.15193,14.04017 0.003,0.57746 0.72406,2.39992 1.60149,4.04992 0.87743,1.65 2.21495,5.025 2.97228,7.5 0.75732,2.475 2.87884,6.60023 4.71447,9.16717 l 3.33753,4.66717 3.18216,-1.54117 c 2.47265,-1.19753 3.49941,-1.27788 4.60498,-0.36033 1.19142,0.98879 1.53634,0.27222 2.12086,-4.40609 0.38392,-3.07281 0.43284,-6.91292 0.1087,-8.53358 -0.62648,-3.1324 0.75743,-12.75331 2.46145,-17.11188 4.60003,-11.76611 24.87096,-14.05994 33.13658,-3.7497 2.55858,3.19148 3.03934,4.8881 3.96703,14 0.58059,5.70262 0.90918,12.84341 0.73019,15.86841 -0.17898,3.025 -0.23459,7.3 -0.12357,9.5 0.93002,18.42948 1.62221,72.62864 1.25797,98.5 -0.0581,4.125 0.10625,12.225 0.36517,18 0.55477,12.37353 -1.19969,41.01382 -2.81476,45.94887 -0.67855,2.07341 -2.32513,4.12293 -4.12869,5.13905 -3.66038,2.06225 -15.56526,3.08946 -20.93571,1.80643 z m 572.11331,30.08309 c 11.4907,-1.50211 11.8162,-1.62503 14.8562,-5.6106 2.0841,-2.73239 3.223,-6.03266 4.4949,-13.02467 1.4983,-8.23669 1.5542,-10.81698 0.4636,-21.41716 -1.1073,-10.76293 -1.5209,-12.34544 -3.8661,-14.79333 -1.4444,-1.50761 -2.6262,-3.24867 -2.6262,-3.86901 0,-1.6149 -3.8424,-2.92089 -9.2598,-3.14732 -1.5179,-0.0634 -3.5304,-1.01535 -4.4722,-2.11535 -0.9672,-1.1296 -2.95,-2 -4.556,-2 -1.5639,0 -3.8013,-0.5126 -4.9719,-1.13912 -1.2847,-0.68751 -8.6769,-1.23577 -18.6459,-1.38291 -19.0548,-0.28124 -21.8599,0.45834 -24.5749,6.47929 -0.9102,2.01844 -2.8156,4.54128 -4.2341,5.60631 -1.4186,1.06504 -5.2429,4.07393 -8.4985,6.68643 -3.2555,2.6125 -6.2808,4.75 -6.7229,4.75 -0.442,0 -1.0457,2.1375 -1.3415,4.75 -0.7689,6.79173 1.8653,14.42016 6.8476,19.83049 3.4086,3.70143 4.673,4.41951 7.7821,4.41951 4.0098,0 10.0808,2.17668 12.7118,4.5577 0.9003,0.81479 3.5704,1.67378 5.9336,1.90888 4.1557,0.41343 6.3679,1.60948 6.6276,3.58342 0.069,0.5225 0.1813,1.625 0.25,2.45 0.082,0.98139 1.2487,1.52782 3.375,1.58048 1.7875,0.0443 5.275,0.66049 7.75,1.36939 5.7581,1.64928 12.837,1.81396 22.6776,0.52757 z M 671.12756,479.9201 c 2.08493,-2.51629 1.55219,-11.99754 -0.99584,-17.7229 -2.5653,-5.76418 -13.27297,-16.79068 -24.14158,-24.86042 -4.13042,-3.06676 -9.98042,-8.28375 -13,-11.5933 -8.92856,-9.78599 -14.8889,-16.53335 -16.48965,-18.66698 -1.35222,-1.80237 -1.62401,-1.84321 -2.75049,-0.41334 -1.95091,2.47634 -5.29868,3.91334 -9.11687,3.91334 -4.55295,0 -4.78214,0.81927 -5.14292,18.38402 -0.38242,18.6187 0.32076,26.61607 2.40688,27.37403 0.8816,0.32031 2.62781,1.3678 3.88047,2.32776 1.25265,0.95996 4.66792,2.49724 7.58949,3.41619 4.89109,1.53844 5.73517,1.54512 10.65395,0.0844 2.9381,-0.87253 6.45458,-1.58641 7.8144,-1.58641 4.42878,0 14.49433,6.57727 21.33361,13.94031 6.44243,6.93581 6.64549,7.05969 11.5718,7.05969 3.44853,0 5.44286,-0.51723 6.38675,-1.6564 z m 36.58348,-62.20266 c 2.27561,-2.36477 7.08543,-3.55475 8.75787,-2.16675 2.03441,1.68842 4.42998,0.10376 5.02007,-3.32074 0.93282,-5.41362 0.89208,-21.8764 -0.0697,-28.15345 l -0.91931,-6 -4.11151,-0.30073 c -3.00575,-0.21985 -4.87143,-1.09392 -6.93709,-3.25 -3.12773,-3.26465 -5.21994,-3.62264 -9.25106,-1.58292 -4.38115,2.21683 -9.57159,2.74738 -15.15771,1.54937 -4.70048,-1.00807 -6.09359,-2.00601 -13.63768,-9.76924 l -8.40241,-8.64648 -2.50127,2.90554 c -1.3757,1.59805 -2.50127,3.28555 -2.50127,3.75 0,0.46445 -1.35,0.84446 -3,0.84446 -1.65,0 -3,0.51528 -3,1.14507 0,0.62979 1.54434,4.35589 3.43187,8.28023 3.8947,8.09741 13.12077,17.57359 21.60622,22.19195 2.75667,1.50037 5.91694,4.19195 7.02282,5.9813 1.10588,1.78935 3.99017,4.41342 6.40954,5.83127 2.41937,1.41784 5.40078,4.03866 6.62536,5.82404 2.59364,3.78141 5.89032,6.69223 7.61523,6.7239 0.66608,0.0122 2.01608,-0.81434 3,-1.83682 z m 377.36706,-47.33175 c 4.2451,0.0283 4.6615,-0.20022 5.7251,-3.1415 0.6309,-1.7446 2.1707,-3.62103 3.4218,-4.16984 3.2812,-1.43929 4.565,-8.34607 4.679,-25.17112 0.094,-13.8543 0.038,-14.24252 -2.4929,-17.25 -1.4239,-1.6922 -3.3964,-3.07673 -4.3834,-3.07673 -0.9869,0 -2.019,-0.85857 -2.2934,-1.90792 -0.2744,-1.04936 -2.4313,-3.18686 -4.793,-4.75 -4.0015,-2.64833 -5.015,-2.84947 -14.8677,-2.95043 -8.6682,-0.0888 -11.2043,-0.4734 -14.0736,-2.13414 -6.3663,-3.68483 -22.8874,-3.64988 -27.7726,0.0588 -0.6999,0.53135 -1.0232,1.75185 -0.7184,2.71221 0.4335,1.36576 -0.988,2.52963 -6.5257,5.34292 -3.894,1.97823 -9.5672,5.74145 -12.6071,8.3627 -5.8077,5.0078 -12.3762,14.60042 -12.3762,18.07413 0,2.15597 4.3191,6.19177 6.6264,6.19177 0.7462,0 1.923,0.94322 2.6151,2.09603 1.4678,2.44469 11.3296,7.28269 14.2849,7.00788 1.3313,-0.1238 3.0464,1.19007 5,3.83019 1.6355,2.21024 3.3111,4.02926 3.7236,4.04226 0.4125,0.013 0.75,0.86215 0.75,1.887 0,1.48738 1.2611,2.11242 6.25,3.09775 3.4375,0.67892 7.375,1.6359 8.75,2.12662 1.375,0.49072 10.15,0.62194 19.5,0.29159 9.35,-0.33035 19.0601,-0.5869 21.5781,-0.57013 z m -1.0948,-189.70742 c 4.8468,-2.29973 6.0797,-3.55887 10.6202,-10.84635 l 5.1368,-8.24458 -0.1719,-17.63649 -0.1718,-17.63649 -2.864,-2.46346 c -2.5571,-2.19957 -3.441,-2.39135 -8.2511,-1.79036 -3.3215,0.41498 -5.8757,0.26772 -6.661,-0.38405 -0.8983,-0.74547 -2.1656,-0.72049 -4.2989,0.0847 -2.6219,0.98964 -3.7301,0.79059 -8.3128,-1.49304 l -5.2876,-2.63492 -2.927,2.46295 c -2.8171,2.3704 -3.0441,2.40239 -6.0435,0.85136 -1.8299,-0.94627 -6.5368,-1.78922 -11.4015,-2.04187 -10.2673,-0.53324 -16.2545,1.27404 -21.8492,6.59537 -4.1664,3.9628 -9.638,7.07542 -12.4378,7.07542 -0.8968,0 -3.9641,2.36292 -6.8162,5.25094 -5.0197,5.08282 -5.2067,5.47647 -5.8405,12.29559 -0.5681,6.11286 -0.3588,7.62471 1.5825,11.42996 2.3095,4.52696 5.6025,7.93207 7.7272,7.99024 0.6684,0.0183 2.7528,1.38327 4.632,3.03327 2.3895,2.09802 4.458,3 6.8798,3 2.193,0 4.1268,0.73346 5.273,2 0.9955,1.1 2.8087,2 4.0293,2 1.2206,0 4.1883,0.71008 6.595,1.57795 2.7252,0.98275 9.2793,1.77173 17.3757,2.09167 7.15,0.28255 13.1575,0.66751 13.3501,0.85548 1.265,1.23493 15.3705,-1.16347 20.1332,-3.42333 z M 297.93046,113.53259 c 4.81755,-0.83125 8.45449,-0.80945 14.5,0.0869 5.97173,0.88541 11.31515,0.92772 20.55423,0.16275 6.86658,-0.56853 12.91455,-0.76802 13.43994,-0.44331 0.74067,0.45775 46.64974,1.47692 67.57537,1.50014 1.925,0.002 29.15,-0.0519 60.5,-0.12012 31.35,-0.0682 62.625,-0.0942 69.5,-0.0579 6.875,0.0364 18.35,-0.42737 25.5,-1.0305 9.1893,-0.77516 14.31909,-0.78699 17.5,-0.0404 2.85352,0.66979 12.3665,0.84911 26,0.49012 11.825,-0.31137 28.34931,-0.67392 36.7207,-0.80568 8.37138,-0.13175 15.61697,-0.68023 16.10131,-1.21885 0.48433,-0.53861 1.67141,-3.88307 2.63794,-7.43211 1.7417,-6.395404 1.73863,-6.467974 -0.34516,-8.155324 -1.15638,-0.93638 -4.24277,-1.98476 -6.85865,-2.32974 -9.93529,-1.31026 -36.62446,-2.31689 -39.50735,-1.49009 -1.64881,0.47288 -8.22931,0.51514 -14.62332,0.0939 -14.3379,-0.94454 -25.07605,-0.69311 -30.49932,0.71413 -2.26938,0.58887 -9.75115,1.28143 -16.62615,1.53903 -9.87087,0.36984 -13.4038,0.13234 -16.79704,-1.12921 -3.76113,-1.39831 -5.32886,-1.43704 -12.57032,-0.31054 -4.91171,0.76407 -10.88575,1.01521 -14.70296,0.61808 -3.53632,-0.36791 -11.37968,-1.08717 -17.42968,-1.59835 -6.05,-0.51118 -12.6763,-1.21802 -14.72511,-1.57076 -2.04882,-0.35274 -5.10966,-0.15869 -6.80188,0.43123 -2.15031,0.74959 -5.24424,0.76593 -10.27489,0.0542 -3.95897,-0.56008 -11.47312,-0.93337 -16.69812,-0.82953 -5.225,0.10383 -10.85,0.18195 -12.5,0.17358 -1.65,-0.008 -13.35,-0.0838 -26,-0.16767 -12.65,-0.0839 -30.425,0.13515 -39.5,0.48669 -9.075,0.35155 -27.3,0.71291 -40.5,0.80304 -13.2,0.0901 -30.63672,0.78831 -38.74826,1.5515 -11.38741,1.07141 -15.94504,1.12853 -20,0.25066 -8.31594,-1.80035 -66.3162,-1.2468 -71.06866,0.67827 -1.78313,0.72229 -5.82002,0.92484 -11,0.55192 -6.16216,-0.44363 -9.26372,-0.19683 -12.55881,0.99931 -2.40665,0.87364 -5.70044,1.58843 -7.31955,1.58843 -2.48087,0 -2.89357,0.35384 -2.62427,2.25 0.20536,1.445964 1.12359,2.364194 2.56955,2.569554 2.54587,0.36157 2.637,0.58882 1.26451,3.15333 -0.73708,1.37726 -0.50687,2.43194 0.91331,4.18426 1.78051,2.1969 2.60505,2.34824 13.23549,2.42927 6.23518,0.0475 15.61169,0.49809 20.83669,1.00125 9.18142,0.88417 13.80707,0.90204 50.5,0.19513 10.23397,-0.19716 19.38801,0.13516 23,0.83497 6.21143,1.20345 6.73647,1.18352 17.43046,-0.66167 z M 753.5,112.02716 c 7.15,-0.35396 13.18474,-0.8224 13.41054,-1.04098 0.22579,-0.21858 -0.27799,-1.18768 -1.11952,-2.15355 -0.84152,-0.96587 -1.97999,-3.10613 -2.52992,-4.75613 -0.8767,-2.6304 -0.6898,-3.25546 1.51707,-5.073534 l 2.51696,-2.07353 -5.89757,-0.18166 c -3.24366,-0.0999 -9.27256,-0.62205 -13.39756,-1.1603 -4.125,-0.53825 -10.425,-1.20739 -14,-1.48698 -3.575,-0.27959 -7.7436,-0.77397 -9.26357,-1.09861 -2.59631,-0.55454 -22.25676,1.93855 -27.73643,3.51718 -1.94523,0.5604 -2.64153,1.58979 -3.13777,4.638834 -0.35077,2.15523 -1.09978,5.35643 -1.66447,7.11378 -0.95345,2.9672 -0.83659,3.2586 1.63777,4.08416 2.82492,0.94251 37.88817,0.74936 59.66447,-0.32868 z"
+         id="path3117"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#483727"
+         d="m -27,966.3132 c 0,-0.1457 0.84726,-2.5086 1.8828,-5.2508 2.12104,-5.6168 5.09478,-11.06 9.8672,-18.06107 2.99483,-4.39338 3.26249,-5.44126 3.40902,-13.34627 0.46572,-25.12308 -1.06085,-36.07479 -6.42292,-46.07856 -2.21102,-4.125 -5.26554,-9.3 -6.78782,-11.5 -2.46896,-3.56813 -2.89487,-5.43516 -3.94479,-17.29256 -0.64735,-7.31091 -1.11099,-17.88591 -1.0303,-23.5 0.0807,-5.61409 -0.16266,-16.95744 -0.54076,-25.20744 -0.71065,-15.50621 0.38107,-28.76474 2.9231,-35.5 2.29532,-6.08159 4.56747,-10.80462 5.36961,-11.16162 1.58341,-0.70471 5.34256,-5.58968 5.71908,-7.43186 0.21432,-1.04859 0.90801,-4.15652 1.54154,-6.90652 1.76486,-7.66086 1.07357,-33.72544 -1.07415,-40.5 -0.95901,-3.025 -2.01032,-6.7188 -2.33625,-8.20844 -0.32593,-1.48965 -2.78128,-5.33841 -5.45632,-8.5528 -2.67505,-3.2144 -5.5487,-7.1706 -6.38588,-8.79156 -2.06902,-4.00604 -3.53301,-14.38287 -2.53906,-17.99701 1.11556,-4.05634 0.25355,-35.31065 -1.06714,-38.69151 -0.58897,-1.50772 -0.85897,-3.30772 -0.6,-4 0.46401,-1.24037 0.88918,-6.53937 2.2714,-28.30946 l 0.70164,-11.05079 5.91713,-8.12529 c 8.1887,-11.24458 9.88999,-15.91253 9.02888,-24.77314 -0.37416,-3.85 -0.59464,-12.196 -0.48996,-18.54666 0.22561,-13.68736 -1.20726,-18.52458 -8.17764,-27.60674 -7.69955,-10.03226 -8.029,-11.09243 -8.96434,-28.8466 -1.1702,-22.21223 -1.70547,-74.98459 -0.81984,-80.828 0.40246,-2.6554 1.5809,-5.86649 2.61876,-7.13575 12.92281,-15.80414 13.7082,-17.42935 13.79024,-28.53625 0.0858,-11.61185 -1.641,-36.57575 -2.66191,-38.48336 -0.58842,-1.09946 -3.17174,-4.5247 -5.74072,-7.61165 -2.56898,-3.08694 -5.8946,-8.66943 -7.39027,-12.40554 l -2.71939,-6.79293 -0.44887,-32.10326 c -0.24688,-17.65679 -0.68095,-34.18882 -0.9646,-36.73784 -0.28365,-2.54902 -0.0466,-5.8686 0.52687,-7.37685 0.57344,-1.50824 1.31978,-6.17268 1.65855,-10.36542 0.67147,-8.31045 2.02464,-11.79877 6.62467,-17.07752 4.2444,-4.87066 7.53507,-12.68304 7.81164,-18.54563 0.12973,-2.75 0.67878,-5.5784 1.22011,-6.28534 1.30573,-1.70519 0.14875,-22.85885 -1.74181,-31.84622 -2.042,-9.70734 -2.90078,-11.58364 -7.65141,-16.71712 -5.76633,-6.23106 -7.88199,-12.734214 -8.50776,-26.151324 -0.96757,-20.74584 -1.16246,-62.002794 -0.34876,-73.831917 0.85091,-12.370039 2.40222,-17.151979 7.35377,-22.668083 5.71917,-6.371237 6.77593,-9.744703 7.90971,-25.25 l 1.07855,-14.75 501.7942,0 c 400.6945,0 501.8222,0.251846 501.9334,1.25 0.6545,5.877895 0.9799,10.66197 1.3093,19.25 0.415,10.818817 1.6302,15.5 4.0239,15.5 0.837,0 3.2652,1.575 5.3959,3.5 6.6779,6.0331 11.4237,4.173236 6.914,-2.709552 l -1.6394,-2.501998 3.64,1.855775 c 2.002,1.020676 5.0073,1.870087 6.6785,1.887578 1.6712,0.01749 3.9121,0.692492 4.9797,1.5 1.0677,0.807509 3.1152,1.468197 4.55,1.468197 1.4349,0 3.0428,0.433851 3.573,0.964113 0.5303,0.530261 8.062,1.092761 16.7371,1.25 12.4173,0.225066 15.962,0.592084 16.6619,1.725156 1.1741,1.901134 16.4732,1.641786 25.2525,-0.428081 3.4564,-0.814894 7.4819,-1.488277 8.9455,-1.496407 4.048,-0.02248 7.1829,-4.628357 10.7843,-15.844765 2.7885,-8.684391 3.1642,-11.110725 2.8807,-18.601429 l -0.3261,-8.614342 38.5,0.06572 38.5,0.06572 0.1533,7.707157 c 0.6591,33.129809 0.9576,40.853547 1.6186,41.883454 0.4153,0.646963 0.9698,14.821963 1.2323,31.5 0.4001,25.423274 0.2271,31.188444 -1.0708,35.674654 -0.9834,3.39946 -1.2749,6.49941 -0.7992,8.5 0.804,3.38117 1.0932,8.64832 1.9304,35.149054 0.6595,20.87786 0.6893,17.52945 -0.3955,44.37058 -0.5089,12.5928 -0.5279,23.95693 -0.043,26 0.4734,1.99618 0.8069,7.90442 0.7411,13.12942 -0.066,5.225 0.1917,11.525 0.5723,14 0.4611,2.99857 0.2266,5.66778 -0.7029,8 -1.0885,2.7314 -1.2033,5.58621 -0.5226,13 0.4798,5.225 0.7891,25.7 0.6874,45.5 -0.2699,52.54812 -0.287,63.1573 -0.1454,90.25 0.014,2.6125 0.2557,13.11673 0.538,23.34274 0.4431,16.05594 0.7992,19.22068 2.6098,23.19513 2.3393,5.13518 2.7022,10.72893 0.91,14.02787 -0.6527,1.20134 -1.3259,5.78426 -1.4959,10.18426 -0.1701,4.4 -0.8194,10.78895 -1.4429,14.19768 -0.9564,5.2286 -0.881,6.82906 0.4821,10.23566 1.1763,2.94005 1.4473,5.64853 0.9965,9.96126 -0.5283,5.05429 -0.3062,6.36272 1.5139,8.91871 2.691,3.77919 2.7481,9.13484 0.1329,12.45956 -1.1,1.39842 -2.0025,3.82161 -2.0056,5.38486 0,1.56325 -0.4941,4.60171 -1.0911,6.75214 -0.8405,3.02704 -0.6964,6.6955 0.6382,16.24676 1.6035,11.47543 1.6099,12.74322 0.091,18.15574 -1.8592,6.62607 -2.3245,33.23785 -0.6578,37.62154 0.5362,1.41026 1.1293,11.22706 1.3181,21.8151 0.3495,19.59967 0.725,21.64729 4.6144,25.16717 1.5749,1.42533 2.0926,3.0923 2.0926,6.73881 0,2.93915 -0.4452,4.84501 -1.1317,4.84501 -0.7348,0 -0.9513,1.34435 -0.6174,3.8341 0.2829,2.10876 0.147,4.49049 -0.302,5.29273 -0.6815,1.21777 -0.927,11.31292 -0.7509,30.87317 0.017,1.925 -0.9798,5.43981 -2.2158,7.81068 -2.0452,3.92277 -2.1788,5.09262 -1.4855,13 0.9924,11.31716 1.6005,24.17802 1.4984,31.68932 -0.082,6.00091 -0.051,13.16248 0.099,23.5 0.044,3.025 -0.1622,9.1 -0.4584,13.5 -0.3802,5.64811 -0.1,9.36248 0.9546,12.6345 1.4943,4.63793 3.0781,12.05429 4.0862,19.13431 0.3277,2.30106 0.049,4.3562 -0.7151,5.27707 -1.2264,1.4778 -1.858,25.35817 -1.0963,41.45412 0.1692,3.575 -0.2373,8.3 -0.9032,10.5 -0.666,2.2 -1.6863,9.37347 -2.2674,15.94105 -0.8625,9.74737 -0.7854,13.27229 0.4194,19.18752 0.8118,3.98556 1.1865,8.06209 0.8327,9.05895 -0.6151,1.73326 -0.4318,9.9342 0.5499,24.60319 0.3589,5.36407 0.1444,6.90967 -1.0213,7.35698 -1.6633,0.63841 -2.0977,7.35231 -0.4754,7.35231 1.5599,0 1.174,3.61069 -0.5377,5.03131 -1.1839,0.98251 -1.4285,2.67907 -1.0628,7.37244 0.3389,4.35105 0.063,6.65195 -0.9623,8.03735 -2.1524,2.9072 -1.7403,5.4637 1.0887,6.7527 1.3892,0.6329 2.3642,1.6358 2.1667,2.2285 -0.2561,0.7683 -174.5226,1.1497 -607.02593,1.3285 C 246,966.4653 -27,966.4589 -27,966.3132 z m 1110,-27.88878 c 13.1003,-1.3733 16.4909,-2.99274 21.057,-10.05742 4.0681,-6.29409 6.4474,-14.79276 7.4567,-26.6346 0.5113,-5.99915 0.3274,-7.67405 -1.0045,-9.14577 -0.8968,-0.99091 -2.037,-4.6719 -2.5338,-8.17997 -1.7097,-12.07281 -5.0098,-15.80086 -17.6546,-19.94419 -9.1598,-3.0014 -14.7353,-3.64239 -15.8595,-1.8233 -0.805,1.30241 -14.4269,0.9913 -16.2231,-0.37052 -1.5544,-1.17848 -36.3584,0.0378 -47.6729,1.666 l -7.9348,1.14185 -2.3668,4.75926 c -1.8357,3.69144 -3.4534,5.30993 -7.2101,7.21357 l -4.8433,2.45431 0.4362,11.28643 c 0.2399,6.20754 0.4927,12.18643 0.5617,13.28643 0.069,1.1 1.3567,3.87026 2.8615,6.15614 1.5048,2.28588 3.0406,5.21088 3.413,6.5 1.4009,4.8493 7.7701,16.90731 9.3615,17.7229 2.2275,1.14157 11.3348,2.12541 24.6558,2.66353 14.2271,0.57472 39.8704,2.53286 40.4478,3.08863 0.2462,0.23705 1.1462,0.15686 2,-0.1782 0.8537,-0.33506 5.8272,-1.05735 11.0522,-1.60508 z M 89,866.06292 c 32.92918,-0.73302 47.92325,-1.4605 52.8138,-2.56241 3.07636,-0.69314 9.66734,-0.77557 19.1862,-0.23993 7.975,0.44875 15.625,0.7401 17,0.64742 1.375,-0.0927 21.175,-0.40494 44,-0.69393 83.42318,-1.05625 108.74658,-1.62847 120.5,-2.7229 7.49797,-0.69818 13.87585,-0.78514 17,-0.23178 3.07867,0.5453 18.64141,0.37933 40.5,-0.43191 19.525,-0.72464 50.35,-1.5018 68.5,-1.72704 18.15,-0.22524 50.775,-0.7785 72.5,-1.22947 21.725,-0.45097 42.2,-0.55982 45.5,-0.24189 3.3,0.31793 7.8,0.18531 10,-0.29471 2.2,-0.48002 19.06166,-1.06744 37.47036,-1.30537 18.40869,-0.23793 35.95869,-0.90967 39,-1.49275 3.25509,-0.62407 26.91917,-1.23142 57.52964,-1.47652 28.6,-0.229 54.8125,-0.69223 58.25,-1.02939 3.8946,-0.382 6.25,-0.23757 6.25,0.38323 0,0.54795 -0.5625,1.22324 -1.25,1.50065 -0.6875,0.27741 0.55,0.50828 2.75,0.51305 2.2,0.005 4.9,-0.37808 6,-0.85077 1.7367,-0.74629 1.616,-0.86868 -0.9167,-0.92971 -1.6041,-0.0387 -2.5953,-0.3916 -2.2026,-0.7843 0.3927,-0.39271 7.3632,-0.59004 15.49,-0.43852 14.717,0.27439 37.6964,-1.20912 43.8793,-2.83279 2.9976,-0.78719 3.25,-0.66802 3.25,1.53454 0,1.68919 0.4298,2.22309 1.4687,1.82443 2.0427,-0.78387 7.3449,-9.01948 8.6837,-13.48789 1.095,-3.65481 0.3139,-6.50429 -4.0803,-14.88576 -0.8366,-1.59567 -4.2237,-2.7262 -3.9798,-1.32835 0.08,0.45559 0.073,1.72835 -0.014,2.82835 -0.1374,1.7341 -0.3559,1.63608 -1.6437,-0.73729 -0.8169,-1.50551 -2.4864,-2.94345 -3.71,-3.19541 -9.7661,-2.01103 -31.5383,-2.87044 -38.9001,-1.5355 -4.9983,0.90636 -7.1384,0.79326 -12.855,-0.67936 -6.087,-1.56805 -7.7362,-1.62161 -14.664,-0.47626 -13.9892,2.31282 -15.4019,2.36899 -22.1448,0.88049 -6.06976,-1.33993 -13.5368,-1.47167 -31.1608,-0.54976 -2.475,0.12947 -10.125,0.11396 -17,-0.0345 -6.875,-0.14842 -24.875,0.20806 -40,0.79218 -41.80354,1.61441 -58.25046,2.12897 -61,1.90845 -4.53042,-0.36335 -22.34589,-0.2814 -31,0.1426 -4.675,0.22905 -12.15327,0.0321 -16.61837,-0.43768 -5.35055,-0.56293 -10.29409,-0.46961 -14.5,0.27373 -6.66608,1.17815 -74.08907,2.67299 -100.88163,2.23667 -10.04546,-0.16359 -18.84311,0.27273 -25,1.23988 -7.00198,1.0999 -12.52392,1.29454 -21,0.74021 -11.70212,-0.76532 -34.45529,0.0182 -57,1.96278 -7.99857,0.68992 -14.60653,0.74726 -18.3496,0.15923 -3.57979,-0.56238 -9.0122,-0.55663 -14,0.0148 -4.48272,0.51358 -11.0754,1.10107 -14.6504,1.30554 -3.575,0.20447 -13.925,0.79899 -23,1.32116 -9.075,0.52217 -18.75,0.59804 -21.5,0.1686 -2.75,-0.42943 -5.40463,-0.5372 -5.89918,-0.23949 -1.31792,0.79338 -26.10556,2.60072 -33.10082,2.41348 -3.3,-0.0883 -8.25,0.26649 -11,0.78848 -2.75,0.52199 -16.87115,1.20352 -31.38033,1.51452 -14.50918,0.311 -26.83787,0.84823 -27.39708,1.19384 -0.55921,0.34561 -8.71307,0.7673 -18.11967,0.93709 -19.89067,0.35902 -26.22715,0.82497 -33.10292,2.43422 -2.75,0.64363 -11.3,1.26722 -19,1.38576 -13.36168,0.2057 -21.5,1.58695 -21.5,3.64903 0,0.50735 -0.43588,0.92245 -0.96862,0.92245 -0.53273,0 -0.68603,-0.7364 -0.34065,-1.63645 0.40982,-1.06796 0.18481,-1.48873 -0.6477,-1.21123 -0.70162,0.23388 -2.26321,2.88189 -3.4702,5.88448 -1.43967,3.58144 -2.86153,5.58304 -4.13367,5.81914 -2.51738,0.4672 -5.43916,3.58402 -5.43916,5.80225 0,1.35474 0.26667,1.47514 1.2,0.54181 1.25524,-1.25524 5.03598,-1.63069 6.06443,-0.60223 0.32877,0.32877 0.35122,1.24025 0.0499,2.02552 -0.42862,1.11695 -0.85822,1.1702 -1.97348,0.24462 -1.00801,-0.83657 -1.73743,-0.87132 -2.49012,-0.11863 -1.6322,1.6322 3.46424,4.48555 8.963,5.01812 2.57745,0.24964 4.86559,0.6209 5.08474,0.82503 0.21915,0.20414 1.34415,0.13646 2.5,-0.15039 1.15585,-0.28684 10.87654,-0.71687 21.60154,-0.95562 z m 160,-76.20841 c 0.825,-0.36181 17.475,-0.72884 37,-0.81564 19.525,-0.0868 47.425,-0.70485 62,-1.37345 14.575,-0.6686 36.2221,-1.37158 48.10467,-1.56217 11.88257,-0.19059 24.03257,-0.59986 27,-0.90948 8.43355,-0.87998 47.38636,-1.87524 120.39533,-3.07616 12.65,-0.20807 25.025,-0.83239 27.5,-1.38738 2.71466,-0.60872 9.07322,-0.72137 16.02695,-0.28395 6.33983,0.3988 17.58983,0.35961 25,-0.0871 7.41018,-0.44671 22.47305,-1.01817 33.47305,-1.26993 11,-0.25175 26.975,-1.21555 35.5,-2.14177 17.72532,-1.92582 30.37265,-2.02298 54.5,-0.41869 14.20902,0.9448 20.15675,0.86517 36.228,-0.48498 10.5753,-0.88844 27.9003,-1.72741 38.5,-1.86438 11.8076,-0.15257 20.0466,-0.67983 21.272,-1.36131 5.3214,-2.95941 8.6631,-3.30393 12.0062,-1.23778 1.7764,1.09788 4.1751,1.99615 5.3304,1.99615 1.4002,0 1.9196,0.47178 1.5577,1.41481 -0.5462,1.42331 1.8132,1.42721 11.1958,0.0185 3.1677,-0.47559 6.2332,-3.13832 8.3636,-7.26464 1.6439,-3.18391 1.7091,-12.13353 0.1099,-15.08221 l -1.309,-2.41353 -1.2577,3.41353 c -0.6918,1.87744 -1.8106,4.89049 -2.4863,6.69566 -0.8253,2.20448 -2.342,3.74734 -4.6196,4.69898 -2.1927,0.91616 -3.391,2.09835 -3.391,3.34542 0,1.06072 -0.67,2.48467 -1.489,3.16433 -0.8189,0.67967 -1.2424,1.63477 -0.941,2.12245 0.3014,0.48768 -0.2233,0.88669 -1.166,0.88669 -1.5926,0 -1.5976,-0.12856 -0.071,-1.81562 2.8104,-3.10546 3.091,-7.37822 0.6552,-9.97885 -1.7423,-1.86017 -2.0263,-3.02109 -1.5005,-6.13335 0.5911,-3.49895 0.3687,-4.03814 -2.5116,-6.08915 -2.321,-1.6527 -5.4594,-2.48776 -11.8182,-3.14463 -4.7619,-0.49191 -9.5852,-0.66961 -10.7184,-0.39491 -1.1333,0.27471 -9.2333,0.77743 -18,1.11715 -8.7668,0.33973 -16.0687,0.74415 -16.2264,0.8987 -0.1578,0.15455 -3.2667,-0.34363 -6.9087,-1.10706 -5.3044,-1.11188 -8.7292,-1.17087 -17.2132,-0.2965 -5.82521,0.60036 -20.9413,0.98072 -33.5913,0.84524 -29.08646,-0.3115 -30.80688,-0.28791 -43.5,0.59664 -5.775,0.40245 -23.55,0.86393 -39.5,1.02552 -15.95,0.16158 -38.225,0.76856 -49.5,1.34884 -12.48443,0.64252 -25.38754,0.72364 -33,0.20746 -7.37391,-0.5 -16.80591,-0.46003 -23,0.0975 -5.775,0.51978 -33.9,1.17565 -62.5,1.4575 -49.40123,0.48683 -57.42102,0.67413 -81,1.89175 -5.5,0.28402 -21.025,0.64631 -34.5,0.80508 -13.475,0.15877 -33.67833,0.85945 -44.89629,1.55707 -11.21796,0.69762 -21.34117,1.02131 -22.49601,0.71931 -1.15485,-0.302 -16.05152,-0.0733 -33.10371,0.50828 -28.14149,0.95974 -71.11706,2.24812 -106.50399,3.19291 -7.425,0.19824 -15.23366,0.93498 -17.35258,1.6372 -2.15866,0.71539 -5.51739,1.01055 -7.63898,0.67129 -2.79799,-0.44742 -5.18588,0.0151 -9.14743,1.77179 -7.31785,3.24498 -9.23825,5.48844 -7.84191,9.1611 0.90054,2.36861 0.73469,3.29151 -1.01736,5.66128 -1.15131,1.55724 -1.80541,3.29714 -1.45356,3.86645 0.35185,0.5693 2.95995,2.08769 5.79578,3.37417 5.09874,2.31308 5.58337,2.34066 43.61125,2.48202 21.15037,0.0786 38.62268,0.3104 38.82736,0.51508 0.63581,0.63582 41.63023,-0.47517 43.21743,-1.17122 z m 840.7243,-40.48776 c 7.924,0.0684 11.1515,-2.56163 13.8722,-11.3039 2.5548,-8.20924 4.6753,-27.64128 3.3863,-31.03155 -0.4839,-1.27284 -0.6288,-3.86139 -0.3219,-5.75233 0.7318,-4.50973 -2.0103,-13.77586 -5.1977,-17.56382 -2.8601,-3.39911 -11.5323,-6.59678 -20.6958,-7.63113 -6.0562,-0.68361 -9.0367,0.0506 -6.6242,1.63167 0.8556,0.5607 -0.1209,0.70292 -2.6432,0.38498 -2.2,-0.27732 -8.725,-0.71015 -14.5,-0.96184 -5.775,-0.25169 -10.5,-0.51524 -10.5,-0.58566 0,-0.16561 -4.9783,-0.67432 -15.1579,-1.54892 -10.3095,-0.88577 -23.1687,0.99163 -29.5921,4.32034 -2.6125,1.35384 -4.75,2.82395 -4.75,3.26692 0,0.44297 -1.841,3.13445 -4.0911,5.98108 l -4.0912,5.17569 0.6585,15.16411 c 0.3621,8.34026 1.0416,16.28911 1.5098,17.66411 0.4683,1.375 1.104,3.66738 1.4127,5.09418 0.8942,4.13336 8.2485,12.64478 11.8829,13.75256 3.6907,1.12492 17.5315,2.92284 22.7184,2.95112 1.925,0.0105 10.25,0.46148 18.5,1.00219 8.25,0.54072 20.4,0.74957 27,0.46413 6.6,-0.28545 14.3509,-0.49872 17.2243,-0.47393 z M 234.18883,737.4399 c 1.88874,-0.74133 4.16181,-0.73947 7.639,0.006 3.38505,0.72596 6.80328,0.74609 10.81117,0.0637 3.22355,-0.54887 13.286,-0.93515 22.361,-0.8584 9.075,0.0767 17.625,0.11881 19,0.0935 1.375,-0.0253 20.275,-0.24778 42,-0.49436 21.725,-0.24657 43.86854,-0.71605 49.20786,-1.0433 5.33932,-0.32724 11.92336,-0.17482 14.63119,0.33871 3.27203,0.62052 8.06567,0.54335 14.29214,-0.2301 5.15285,-0.64008 21.06881,-1.24622 35.36881,-1.34696 87.12825,-0.61386 124.75538,-1.26881 131.5,-2.28894 7.84107,-1.18598 69.99999,-0.87176 73.12608,0.36965 0.89434,0.35516 6.42642,-0.067 12.2935,-0.93822 7.44322,-1.10521 22.06412,-1.7729 48.37392,-2.2091 43.37921,-0.71918 44.82922,-0.72516 52.2065,-0.2152 3.025,0.20911 11.1784,-0.19538 18.1188,-0.89886 8.2981,-0.84111 14.1188,-0.96623 17,-0.36542 4.5607,0.95104 38.5436,0.69097 47.5465,-0.36387 3.1573,-0.36993 5.8785,-0.1659 7,0.52482 1.3847,0.85288 2.8059,0.80662 5.7949,-0.18863 3.7871,-1.26098 4.061,-1.64664 6.2631,-8.81865 2.4896,-8.10812 4.2345,-25.8668 4.1266,-42 -0.035,-5.225 0.2624,-12.05268 0.6607,-15.17261 0.5302,-4.15278 0.2818,-7.09996 -0.9269,-11 -1.3316,-4.29635 -1.5448,-7.94013 -1.1018,-18.82739 0.9182,-22.56166 0.2947,-83.75608 -1.1411,-112 -0.4333,-8.525 -0.7082,-24.5 -0.6109,-35.5 0.2426,-27.4052 0.1481,-43.34151 -0.2818,-47.5 -0.3116,-3.01416 -1.3302,-68.55978 -1.4181,-91.25 -0.016,-4.2625 -0.3675,-7.75005 -0.78,-7.75011 -1.2182,-1.8e-4 -0.5938,110.0095 0.6506,114.63095 0.7602,2.82312 0.7823,7.8472 0.074,16.94123 -0.5534,7.11036 -1.0118,22.15293 -1.0187,33.42793 -0.012,19.57931 -0.09,20.40156 -1.7344,18.30811 -1.5445,-1.96606 -2.3814,-2.1371 -8.1231,-1.6601 -3.5206,0.29249 -9.1456,1.45792 -12.5,2.58984 -3.442,1.16151 -9.0928,2.12773 -12.9718,2.21802 -4.8712,0.11338 -7.2012,0.60596 -8,1.69129 -1.5912,2.16201 -5.7155,3.01359 -16.5293,3.41297 -9.5589,0.35304 -11.799,-0.17591 -15.6809,-3.70267 -2.0459,-1.85875 -2.1679,-1.8551 -6.8233,0.2042 -4.4748,1.97941 -4.9612,2.00839 -8.6871,0.51758 -5.5095,-2.20449 -8.95307,-1.9813 -15.62789,1.01288 -5.20641,2.33548 -6.57055,2.53116 -13.77851,1.9765 -5.75272,-0.44268 -8.70228,-1.16825 -10.5,-2.58293 -1.375,-1.08202 -3.9275,-2.60886 -5.67222,-3.39298 -1.74472,-0.78411 -3.93397,-2.58825 -4.86501,-4.00918 -1.30455,-1.99101 -2.52646,-2.58494 -5.32778,-2.58969 -1.99924,-0.003 -4.92393,-0.67839 -6.4993,-1.5 -1.57537,-0.82161 -3.37537,-1.48768 -4,-1.48016 -0.62463,0.008 -4.06028,2.68973 -7.63478,5.96045 -3.5745,3.27072 -8.0745,6.59597 -10,7.38943 -7.75595,3.19609 -19.54121,5.8405 -27.98334,6.27897 -8.55335,0.44425 -9.28915,0.30885 -17.72073,-3.26112 -14.60388,-6.18336 -27.28218,-16.85646 -27.2931,-22.97642 -0.002,-1.15226 -0.93818,-2.94067 -2.08028,-3.97426 -2.03768,-1.84407 -2.10786,-1.83853 -3.75,0.29581 -1.24668,1.62036 -2.9463,2.25136 -6.66447,2.47426 -3.54139,0.2123 -5.03971,0.73487 -5.15871,1.7992 -1.0077,9.01268 -2.9289,16.19496 -4.80296,17.95554 -3.56493,3.34908 -13.05236,6.04446 -21.2758,6.04446 -6.11253,0 -8.16756,-0.44081 -11.69654,-2.50893 -2.35464,-1.37991 -5.05182,-3.36049 -5.99373,-4.40129 -3.14593,-3.47621 -4.69039,-13.5838 -4.75059,-31.08978 -0.10397,-30.23541 -0.47822,-41.47776 -1.46471,-44 -0.58203,-1.48812 -0.79484,-11.20215 -0.52578,-24 0.24861,-11.825 0.49878,-24.2 0.55593,-27.5 0.0571,-3.3 -0.23381,-17.475 -0.64657,-31.5 -1.33942,-45.51213 1.37656,-52.10554 21.66776,-52.6015 12.78681,-0.31254 17.04998,1.60953 22.65657,10.21486 2.86494,4.39728 5.0018,6.60599 6.80172,7.03041 1.44343,0.34035 4.06908,1.69404 5.83478,3.00819 l 3.21037,2.38936 3.91434,-4.27066 c 2.15289,-2.34886 5.16189,-5.76425 6.68667,-7.58975 3.7947,-4.54311 20.18515,-15.04433 24.47826,-15.68302 1.925,-0.28638 5.41896,-0.96556 7.76435,-1.50929 5.87869,-1.36285 9.87636,-1.23822 13.58452,0.42351 1.73312,0.77666 4.72613,1.67663 6.65113,1.99994 5.98348,1.00495 15.35372,6.05595 18.51898,9.98261 1.63956,2.03395 5.44963,6.17696 8.46682,9.20669 4.23172,4.24931 5.94624,5.35997 7.5,4.85848 7.83211,-2.5279 11.11957,-3.13864 12.20575,-2.26755 0.85847,0.68847 1.48777,-0.11332 2.25126,-2.86835 1.4532,-5.24381 5.05318,-11.26493 8.05719,-13.47597 3.28352,-2.41678 13.2864,-4.20028 19.17578,-3.41903 5.35872,0.71086 12.23515,3.53327 16.19259,6.64619 2.45952,1.93466 3.01243,2.00858 5.92223,0.79169 1.7652,-0.73821 5.4594,-1.20492 8.2094,-1.03714 4.1422,0.25271 6.1705,-0.30699 11.8227,-3.26231 5.5163,-2.8843 7.9228,-3.56736 12.5685,-3.56736 8.5025,0 15.5592,2.43812 19.9132,6.88013 2.0326,2.0737 6.1064,5.07182 9.053,6.6625 2.9466,1.59067 5.7212,3.84904 6.1659,5.01859 0.8344,2.19473 4.9889,4.41334 8.8021,4.70058 1.5512,0.11685 2.1746,0.81948 2.1746,2.451 0,1.3664 0.6039,2.2872 1.5,2.2872 0.9333,0 1.5,-0.94444 1.5,-2.5 0,-1.55556 0.5667,-2.5 1.5,-2.5 1.008,0 1.5,1.00815 1.5,3.07332 0,2.39841 0.3843,2.99372 1.75,2.71082 1.1565,-0.23958 1.6968,-1.20385 1.5932,-2.84342 -0.1102,-1.74437 0.5747,-2.82611 2.3071,-3.64366 2.1667,-1.02253 2.5605,-0.90149 3.2652,1.00367 l 0.8015,2.16642 0.6873,-2.16563 c 0.7414,-2.33594 0.809,-10.97167 0.4365,-55.80152 -0.1325,-15.95 -0.1499,-34.175 -0.039,-40.5 0.4781,-27.18918 -0.6476,-92.85398 -1.68,-98 -0.8413,-4.19332 -1.8688,-6.15334 -4.325,-8.25 -4.6376,-3.95881 -5.3671,-3.39837 -2.3276,1.78821 3.0093,5.13494 3.2038,9.19383 0.3392,7.07695 -0.9303,-0.68741 -1.8641,-2.56954 -2.0752,-4.1825 -0.502,-3.83605 -3.3946,-5.18778 -13.8943,-6.49282 -4.5866,-0.57007 -10.5946,-1.51093 -13.3512,-2.09079 -3.4883,-0.73377 -6.2245,-0.73752 -9,-0.0123 -3.8898,1.0163 -25.2034,1.75882 -34.488,1.20149 -5.3129,-0.31892 -81.39319,0.90913 -98,1.58187 -9.625,0.3899 -20.65,0.52239 -24.5,0.29442 -3.85,-0.22797 -21.175,-0.32926 -38.5,-0.2251 -17.325,0.10417 -38.025,0.22945 -46,0.2784 -7.975,0.0489 -20.35,-0.01 -27.5,-0.12996 -7.15,-0.12044 -26.95,-0.0839 -44,0.0812 -17.05,0.16511 -36.625,-0.12568 -43.5,-0.64619 -7.70474,-0.58333 -13.65086,-0.59064 -15.5,-0.0191 -1.65,0.51002 -15.375,1.17544 -30.5,1.47872 -34.63615,0.69449 -36.6279,0.71216 -53,0.47014 -7.425,-0.10976 -14.4,-0.15932 -15.5,-0.11013 -1.1,0.0492 -9.2,0.0452 -18,-0.009 -14.36454,-0.0881 -39.35915,0.32648 -78.5,1.3022 -7.425,0.18509 -14.58967,-0.0692 -15.9215,-0.56517 -1.63999,-0.61069 -4.51569,-0.3765 -8.91039,0.72565 -5.52738,1.38621 -7.92662,1.46021 -16.19146,0.49937 -7.19077,-0.83597 -11.48548,-0.83687 -16.58961,-0.003 -3.78787,0.61849 -10.26204,0.856 -14.38704,0.52781 -10.57217,-0.84114 -22.21461,0.66689 -25.57886,3.31321 -1.47997,1.16415 -4.11517,2.11663 -5.856,2.11663 -3.48403,0 -5.56514,1.51265 -5.56514,4.04501 0,0.90476 -0.94607,2.5012 -2.10238,3.54764 -2.93205,2.65347 -4.89762,6.77467 -4.89762,10.2688 0,2.10203 -0.92632,3.74021 -3.19378,5.64815 -3.15861,2.6578 -3.19657,2.79733 -3.44751,12.67319 -0.14336,5.64207 -0.75134,10.58537 -1.39766,11.36415 -1.98373,2.39024 -2.42499,12.81035 -0.65841,15.54776 1.51488,2.34739 1.66192,9.40054 0.39412,18.9053 -0.25677,1.925 -0.0626,5.43084 0.43156,7.79076 0.63244,3.02047 0.53668,4.94481 -0.32347,6.5 -1.04233,1.88458 -1.61097,8.30518 -1.96697,22.20924 -0.0422,1.65 0.37964,7.05 0.93753,12 0.55788,4.95 0.68607,9.45 0.28487,10 -0.40121,0.55 -0.54421,3.475 -0.31778,6.5 1.39119,18.58537 1.43708,22 0.29568,22 -0.80065,0 -1.13748,2.30388 -1.05997,7.25 0.0625,3.9875 0.10717,12.09558 0.0993,18.01795 -0.008,5.92236 0.32597,11.77236 0.7419,13 0.41594,1.22763 0.59776,6.95705 0.40404,12.73205 -0.53335,15.90011 -0.26541,24.55922 0.92136,29.77598 1.89069,8.31103 2.44982,32.39037 0.98622,42.47213 -0.58043,3.99821 -0.63457,9.18938 -0.13285,12.73885 0.52265,3.69762 0.46128,7.38691 -0.16033,9.63822 -0.55392,2.00611 -0.7445,6.17363 -0.42352,9.26115 0.74928,7.20729 1.11,20.07771 0.75993,27.11367 -0.1505,3.025 0.36253,11.34159 1.14007,18.48131 0.99176,9.1067 1.10343,13.47818 0.37412,14.64598 -0.76349,1.22255 -0.53275,2.95385 0.86877,6.51869 1.96518,4.99851 2.07598,11.83203 0.22851,14.09306 -1.26659,1.55012 -0.14576,7.96176 1.49595,8.55753 0.94829,0.34412 0.95398,0.89103 0.0257,2.46737 -0.89383,1.51783 -0.95285,5.19319 -0.23556,14.66942 0.72869,9.62678 0.6643,13.17186 -0.26981,14.85541 -0.67478,1.21618 -1.07748,2.66123 -0.89489,3.21123 0.1826,0.55 0.46048,5.33538 0.61752,10.63418 0.15703,5.29881 0.76301,12.04881 1.34663,15 0.58361,2.9512 1.33843,7.38131 1.67737,9.84469 0.33894,2.46338 0.87915,4.90425 1.20047,5.42414 0.84183,1.36213 2.24518,33.12162 2.32408,52.59699 0.031,7.66136 1.27151,14.07993 4.44503,23 1.27189,3.575 2.60617,8.75 2.96507,11.5 0.92196,7.06436 6.37237,15.11755 11.83406,17.48527 6.3272,2.74293 17.6335,4.36413 21.13946,3.03116 2.91183,-1.10707 21.38023,-0.59072 36.04322,1.00773 7.59642,0.8281 12.48856,0.48783 16.68883,-1.16076 z M 270.3827,533.54891 c -5.28483,-1.62891 -10.99977,-8.81116 -12.40842,-15.5943 -1.29109,-6.21706 -1.33676,-7.42085 -1.26621,-33.37811 0.0381,-14.00915 -0.11671,-25.20631 -0.78797,-57 -0.1848,-8.75315 -0.20067,-21.91817 -0.0711,-58.96202 0.10924,-31.22128 0.39437,-38.25473 1.71158,-42.22049 1.62526,-4.89319 5.86907,-9.39247 9.76645,-10.35437 4.75449,-1.17343 27.55876,-1.97585 33.71658,-1.18639 3.59901,0.46141 12.02916,0.46821 18.73367,0.0151 10.47337,-0.70782 12.91988,-0.57574 17.37286,0.93787 2.85056,0.96894 5.89541,2.39012 6.76633,3.15819 0.87092,0.76807 4.1843,2.20638 7.36308,3.19625 l 5.77959,1.79976 2.9692,-3.60216 c 3.5516,-4.30871 10.3005,-7.79067 15.03734,-7.7582 4.38801,0.0301 17.5966,3.52518 20.49211,5.4224 3.46424,2.26985 6.43391,7.88918 7.52552,14.24007 1.42669,8.3004 2.14731,49.8878 1.07908,62.27441 -0.5746,6.66267 -0.54613,11.56396 0.0784,13.5 0.58877,1.82516 0.97977,23.61572 0.97864,54.53958 -0.002,58.04267 -0.21711,60.1567 -6.69615,65.84537 -3.05459,2.68197 -4.26512,3.02359 -13.04674,3.68198 -12.64013,0.94767 -16.34045,-0.21167 -21.01925,-6.58547 -3.19306,-4.34981 -3.4597,-5.2729 -3.48822,-12.07586 -0.017,-4.05131 -0.48649,-10.74102 -1.04335,-14.86602 -0.55687,-4.125 -1.20695,-26.625 -1.44462,-50 -1.02456,-100.76447 -0.87163,-94.83101 -2.48115,-96.26779 -0.825,-0.73646 -3.90082,-2.16146 -6.83516,-3.16666 -5.25602,-1.80055 -5.40434,-1.79677 -10,0.2548 -5.86533,2.61836 -14.24282,4.30804 -17.87999,3.60626 -6.56041,-1.2658 -15.58671,5.66028 -17.3669,13.32602 -0.47863,2.06106 -0.87024,6.89737 -0.87024,10.74737 0,14.55517 3.58957,21.18078 13.24096,24.44011 3.35482,1.13294 6.85042,2.05989 7.768,2.05989 2.123,0 8.85282,5.31761 11.16305,8.82057 1.39277,2.11183 1.7685,4.80588 1.77369,12.71767 l 0.007,10.03824 -4.50461,3.76539 c -4.86662,4.06798 -7.50879,5.17972 -14.52796,6.11288 -5.7855,0.76916 -10.42622,3.59799 -12.50858,7.62482 -1.34094,2.59309 -1.63817,6.45753 -1.63785,21.29422 2.1e-4,9.96942 0.11325,19.25121 0.25121,20.62621 0.51618,5.14483 -1.28273,20.73086 -3.12817,27.103 -1.63944,5.66081 -2.49774,7.00871 -6.01501,9.44618 -3.62374,2.51126 -5.11403,2.87474 -12.76586,3.11361 -4.76474,0.14875 -10.06595,-0.16192 -11.78047,-0.69038 z m 237.18159,-4.07806 c -7.11449,-1.69969 -10.35546,-5.19992 -16.06399,-17.34901 -2.88314,-6.13602 -5.56097,-12.25641 -5.95073,-13.60087 -1.52455,-5.2589 -5.07446,-13.56095 -6.76852,-15.82933 C 477.80147,481.37997 477,479.05427 477,477.52343 c 0,-4.1445 -0.93411,-5.8615 -4.07152,-7.48392 -8.23263,-4.25725 -15.25149,1.57549 -11.80057,9.8064 0.95359,2.27446 1.34508,7.96599 1.32275,19.23059 -0.0358,18.04537 -1.26926,22.64524 -7.4722,27.86467 -3.18399,2.67915 -3.4693,2.72662 -13.65823,2.27263 -11.24324,-0.50098 -14.94879,-1.89193 -15.71769,-5.89995 -1.14945,-5.99174 -2.81744,-21.52418 -2.5491,-23.73735 0.74079,-6.10967 -0.66205,-57.45993 -1.83264,-67.08301 -0.50734,-4.17066 -0.62822,-11.37066 -0.26862,-16 0.78354,-10.08691 0.41012,-34.66621 -0.78875,-51.91699 -0.7406,-10.65669 -0.59297,-13.82482 1.00113,-21.48398 1.02842,-4.94118 1.67721,-9.48596 1.44178,-10.09951 -0.23544,-0.61354 0.0182,-3.20793 0.56363,-5.76531 0.79409,-3.72328 1.89385,-5.38902 5.5193,-8.35981 3.7949,-3.10963 5.5499,-3.81584 10.84458,-4.36386 6.08534,-0.62986 18.65216,0.83333 21.32038,2.48238 1.70552,1.05407 10.14421,12.72482 10.15193,14.04017 0.003,0.57746 0.72406,2.39992 1.60149,4.04992 0.87743,1.65 2.21495,5.025 2.97228,7.5 0.75732,2.475 2.87884,6.60023 4.71447,9.16717 l 3.33753,4.66717 3.18216,-1.54117 c 2.47265,-1.19753 3.49941,-1.27788 4.60498,-0.36033 1.19142,0.98879 1.53634,0.27222 2.12086,-4.40609 0.38392,-3.07281 0.43284,-6.91292 0.1087,-8.53358 -0.62648,-3.1324 0.75743,-12.75331 2.46145,-17.11188 4.60003,-11.76611 24.87096,-14.05994 33.13658,-3.7497 2.55858,3.19148 3.03934,4.8881 3.96703,14 0.58059,5.70262 0.90918,12.84341 0.73019,15.86841 -0.17898,3.025 -0.23459,7.3 -0.12357,9.5 0.93002,18.42948 1.62221,72.62864 1.25797,98.5 -0.0581,4.125 0.10625,12.225 0.36517,18 0.55477,12.37353 -1.19969,41.01382 -2.81476,45.94887 -0.67855,2.07341 -2.32513,4.12293 -4.12869,5.13905 -3.66038,2.06225 -15.56526,3.08946 -20.93571,1.80643 z m 572.93571,31.9982 12,-1.2677 4.2465,-4.53682 c 2.3356,-2.49526 4.687,-5.89835 5.2254,-7.56243 1.1496,-3.55355 1.6277,-16.07075 1.2781,-33.4657 l -0.25,-12.4401 -5.604,-5.17405 c -6.8711,-6.34382 -9.1903,-6.92908 -33.896,-8.5536 -20.3487,-1.33802 -51.3392,-0.64182 -58.9876,1.32516 -4.387,1.12821 -5.2668,1.81634 -7.3053,5.71367 -1.2748,2.43704 -3.6428,5.9402 -5.2624,7.78479 -2.9523,3.36251 -3.763,7.47056 -3.1148,15.78423 0.1286,1.65 0.5765,8.22406 0.9953,14.60901 0.6714,10.23597 1.148,12.39421 4.0297,18.24776 1.7975,3.65132 4.253,7.20226 5.4567,7.89099 2.1755,1.24485 28.5881,1.54172 45.1884,0.50791 4.6636,-0.29044 9.3364,0.14829 14,1.31449 3.85,0.96274 7.675,1.60186 8.5,1.42026 0.825,-0.18159 6.9,-0.90063 13.5,-1.59787 z M 671.12756,479.9201 c 2.08493,-2.51629 1.55219,-11.99754 -0.99584,-17.7229 -2.5653,-5.76418 -13.27297,-16.79068 -24.14158,-24.86042 -4.13042,-3.06676 -9.98042,-8.28375 -13,-11.5933 -8.92856,-9.78599 -14.8889,-16.53335 -16.48965,-18.66698 -1.35222,-1.80237 -1.62401,-1.84321 -2.75049,-0.41334 -1.95091,2.47634 -5.29868,3.91334 -9.11687,3.91334 -4.55295,0 -4.78214,0.81927 -5.14292,18.38402 -0.38242,18.6187 0.32076,26.61607 2.40688,27.37403 0.8816,0.32031 2.62781,1.3678 3.88047,2.32776 1.25265,0.95996 4.66792,2.49724 7.58949,3.41619 4.89109,1.53844 5.73517,1.54512 10.65395,0.0844 2.9381,-0.87253 6.45458,-1.58641 7.8144,-1.58641 4.42878,0 14.49433,6.57727 21.33361,13.94031 6.44243,6.93581 6.64549,7.05969 11.5718,7.05969 3.44853,0 5.44286,-0.51723 6.38675,-1.6564 z m 36.58348,-62.20266 c 2.27561,-2.36477 7.08543,-3.55475 8.75787,-2.16675 2.03441,1.68842 4.42998,0.10376 5.02007,-3.32074 0.93282,-5.41362 0.89208,-21.8764 -0.0697,-28.15345 l -0.91931,-6 -4.11151,-0.30073 c -3.00575,-0.21985 -4.87143,-1.09392 -6.93709,-3.25 -3.12773,-3.26465 -5.21994,-3.62264 -9.25106,-1.58292 -4.38115,2.21683 -9.57159,2.74738 -15.15771,1.54937 -4.70048,-1.00807 -6.09359,-2.00601 -13.63768,-9.76924 l -8.40241,-8.64648 -2.50127,2.90554 c -1.3757,1.59805 -2.50127,3.28555 -2.50127,3.75 0,0.46445 -1.35,0.84446 -3,0.84446 -1.65,0 -3,0.51528 -3,1.14507 0,0.62979 1.54434,4.35589 3.43187,8.28023 3.8947,8.09741 13.12077,17.57359 21.60622,22.19195 2.75667,1.50037 5.91694,4.19195 7.02282,5.9813 1.10588,1.78935 3.99017,4.41342 6.40954,5.83127 2.41937,1.41784 5.40078,4.03866 6.62536,5.82404 2.59364,3.78141 5.89032,6.69223 7.61523,6.7239 0.66608,0.0122 2.01608,-0.81434 3,-1.83682 z m 386.50756,-46.29515 c 0.9453,-0.48542 2.9666,-3.0118 4.4918,-5.61418 2.6776,-4.56845 2.78,-5.2661 2.9701,-20.23161 0.2325,-18.30654 -1.518,-32.96193 -4.5472,-38.06863 -1.2485,-2.10469 -3.9086,-4.46349 -6.4846,-5.75 -4.5057,-2.25028 -12.0641,-2.93633 -13.1416,-1.19282 -0.3629,0.58718 0.086,0.72119 1.105,0.33006 2.8845,-1.1069 0.7082,1.28875 -2.846,3.13279 -1.7963,0.93202 -4.3711,2.31184 -5.7216,3.06625 -2.3069,1.28867 -2.7384,1.10701 -7.1319,-3.00267 -2.8472,-2.66319 -6.3497,-4.82486 -8.9537,-5.52605 -5.1171,-1.37788 -21.7805,-0.37925 -26.4873,1.58737 -1.7227,0.71982 -7.8211,1.61909 -13.5519,1.99838 -5.7309,0.37928 -10.9796,1.1331 -11.664,1.67514 -0.6843,0.54204 -2.3989,0.7648 -3.8102,0.49501 -1.9225,-0.36751 -2.9559,0.10456 -4.1208,1.88232 -0.8551,1.30507 -2.023,2.37285 -2.5953,2.37285 -0.5723,0 -2.5794,1.17372 -4.4602,2.60826 l -3.4196,2.60827 0.4954,7.14173 c 0.2724,3.92796 1.0182,13.44174 1.6571,21.14174 l 1.1618,14 4.5926,7.25 c 2.5259,3.9875 4.6265,7.30754 4.668,7.37786 0.041,0.0703 12.4505,0.65964 27.5755,1.3096 28.8267,1.23876 67.2853,0.9147 70.2186,-0.59167 z m -7.8252,-187.77184 c 6.2341,-1.35949 7.1452,-2.16871 9.1134,-8.09433 0.889,-2.67655 2.6011,-6.11816 3.8048,-7.64802 2.0698,-2.6308 2.1983,-3.86671 2.3712,-22.8021 0.2035,-22.2923 0.2901,-21.96982 -6.8792,-25.62888 -2.033,-1.0376 -4.0926,-2.59464 -4.5769,-3.46009 -1.5064,-2.69176 -6.432,-5.40023 -8.1574,-4.48553 -1.023,0.54238 -2.08,0.28066 -3.0365,-0.75185 -1.3008,-1.40412 -1.2724,-1.50908 0.25,-0.92489 0.9817,0.37675 1.7172,0.18774 1.7172,-0.44131 0,-0.70642 -1.4319,-0.90823 -4,-0.56378 -2.3347,0.31316 -4,0.1243 -4,-0.45365 0,-1.05567 -9.329,-0.54141 -23.6154,1.3018 -5.6321,0.72664 -9.2695,0.72834 -11.8873,0.006 -4.0289,-1.11245 -22.4119,0.74958 -27.8637,2.82234 -1.5201,0.57793 -4.5345,1.05079 -6.6987,1.05079 -3.9868,0 -7.9349,2.61885 -7.9349,5.26335 0,1.92214 -6.9773,11.86868 -7.9179,11.28738 -2.8495,-1.7611 -4.291,32.53846 -1.5722,37.40904 0.7799,1.39713 2.0842,3.92832 2.8984,5.62488 0.8142,1.69656 2.916,4.62156 4.6706,6.5 l 3.1902,3.41535 21.1154,1.09589 c 24.7562,1.28484 62.016,1.00303 69.0089,-0.52194 z m -20.7068,-69.60503 c -1.6862,-3.53604 -0.7165,-5.64029 2.3474,-5.09395 9.0608,1.61565 9.7112,2.85944 3.2764,6.26585 l -4.0441,2.14082 -1.5797,-3.31272 z m -767.75614,-0.51283 c 4.81755,-0.83125 8.45449,-0.80945 14.5,0.0869 5.97173,0.88541 11.31515,0.92772 20.55423,0.16275 6.86658,-0.56853 12.91455,-0.76802 13.43994,-0.44331 0.74067,0.45775 46.64974,1.47692 67.57537,1.50014 1.925,0.002 29.15,-0.0519 60.5,-0.12012 31.35,-0.0682 62.625,-0.0942 69.5,-0.0579 6.875,0.0364 18.35,-0.42737 25.5,-1.0305 9.1893,-0.77516 14.31909,-0.78699 17.5,-0.0404 2.85352,0.66979 12.3665,0.84911 26,0.49012 11.825,-0.31137 28.34931,-0.67392 36.7207,-0.80568 8.37138,-0.13175 15.61697,-0.68023 16.10131,-1.21885 0.48433,-0.53861 1.67141,-3.88307 2.63794,-7.43211 1.7417,-6.395404 1.73863,-6.467974 -0.34516,-8.155324 -1.15638,-0.93638 -4.24277,-1.98476 -6.85865,-2.32974 -9.93529,-1.31026 -36.62446,-2.31689 -39.50735,-1.49009 -1.64881,0.47288 -8.22931,0.51514 -14.62332,0.0939 -14.3379,-0.94454 -25.07605,-0.69311 -30.49932,0.71413 -2.26938,0.58887 -9.75115,1.28143 -16.62615,1.53903 -9.87087,0.36984 -13.4038,0.13234 -16.79704,-1.12921 -3.76113,-1.39831 -5.32886,-1.43704 -12.57032,-0.31054 -4.91171,0.76407 -10.88575,1.01521 -14.70296,0.61808 -3.53632,-0.36791 -11.37968,-1.08717 -17.42968,-1.59835 -6.05,-0.51118 -12.6763,-1.21802 -14.72511,-1.57076 -2.04882,-0.35274 -5.10966,-0.15869 -6.80188,0.43123 -2.15031,0.74959 -5.24424,0.76593 -10.27489,0.0542 -3.95897,-0.56008 -11.47312,-0.93337 -16.69812,-0.82953 -5.225,0.10383 -10.85,0.18195 -12.5,0.17358 -1.65,-0.008 -13.35,-0.0838 -26,-0.16767 -12.65,-0.0839 -30.425,0.13515 -39.5,0.48669 -9.075,0.35155 -27.3,0.71291 -40.5,0.80304 -13.2,0.0901 -30.63672,0.78831 -38.74826,1.5515 -11.38741,1.07141 -15.94504,1.12853 -20,0.25066 -8.31594,-1.80035 -66.3162,-1.2468 -71.06866,0.67827 -1.78313,0.72229 -5.82002,0.92484 -11,0.55192 -6.16216,-0.44363 -9.26372,-0.19683 -12.55881,0.99931 -2.40665,0.87364 -5.70044,1.58843 -7.31955,1.58843 -2.48087,0 -2.89357,0.35384 -2.62427,2.25 0.20536,1.445964 1.12359,2.364194 2.56955,2.569554 2.54587,0.36157 2.637,0.58882 1.26451,3.15333 -0.73708,1.37726 -0.50687,2.43194 0.91331,4.18426 1.78051,2.1969 2.60505,2.34824 13.23549,2.42927 6.23518,0.0475 15.61169,0.49809 20.83669,1.00125 9.18142,0.88417 13.80707,0.90204 50.5,0.19513 10.23397,-0.19716 19.38801,0.13516 23,0.83497 6.21143,1.20345 6.73647,1.18352 17.43046,-0.66167 z M 753.5,112.02716 c 7.15,-0.35396 13.18474,-0.8224 13.41054,-1.04098 0.22579,-0.21858 -0.27799,-1.18768 -1.11952,-2.15355 -0.84152,-0.96587 -1.97999,-3.10613 -2.52992,-4.75613 -0.8767,-2.6304 -0.6898,-3.25546 1.51707,-5.073534 l 2.51696,-2.07353 -5.89757,-0.18166 c -3.24366,-0.0999 -9.27256,-0.62205 -13.39756,-1.1603 -4.125,-0.53825 -10.425,-1.20739 -14,-1.48698 -3.575,-0.27959 -7.7436,-0.77397 -9.26357,-1.09861 -2.59631,-0.55454 -22.25676,1.93855 -27.73643,3.51718 -1.94523,0.5604 -2.64153,1.58979 -3.13777,4.638834 -0.35077,2.15523 -1.09978,5.35643 -1.66447,7.11378 -0.95345,2.9672 -0.83659,3.2586 1.63777,4.08416 2.82492,0.94251 37.88817,0.74936 59.66447,-0.32868 z"
+         id="path3115"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#072435"
+         d="m -22.93804,962.3273 c 1.04342,-5.5162 5.23979,-14.92669 7.48747,-16.79082 3.58045,-2.96947 4.73517,-8.0118 5.02892,-21.95998 0.4964,-23.57048 -2.00571,-34.70511 -10.93982,-48.68328 -2.80939,-4.39553 -3.50072,-6.73309 -4.54879,-15.3807 -0.67975,-5.60857 -1.38813,-19.53463 -1.57418,-30.9468 -0.18605,-11.41216 -0.64224,-25.19085 -1.01376,-30.6193 -1.07923,-15.76897 2.68372,-32.53591 9.22062,-41.08529 5.88498,-7.69674 7.31137,-14.78411 6.69878,-33.28463 -0.67815,-20.48047 -2.55539,-27.10674 -10.51597,-37.1192 -4.82808,-6.07253 -5.93386,-8.23271 -6.93775,-13.55316 -0.65684,-3.48108 -0.86523,-7.79138 -0.4631,-9.57844 0.95855,-4.25976 0.96921,-11.37606 0.0408,-27.2492 -0.86375,-14.76803 -0.78521,-24.39348 0.35085,-43 0.87227,-14.28618 1.42737,-15.93563 8.52124,-25.32062 6.1135,-8.08797 7.90506,-14.09409 6.47536,-21.70826 -0.68259,-3.63532 -0.86796,-9.98978 -0.47387,-16.2442 0.82213,-13.04751 -0.98865,-19.46826 -8.76834,-31.09122 -3.04909,-4.55537 -6.0009,-9.71197 -6.55958,-11.4591 -0.55868,-1.74713 -1.26292,-9.4766 -1.56496,-17.1766 -0.30205,-7.7 -0.70466,-16.925 -0.89468,-20.5 -0.62231,-11.70772 -0.75527,-42.29349 -0.22703,-52.22373 0.55933,-10.5145 1.95347,-14.47016 6.04469,-17.15082 C -26.148,379.28259 -25,378.04773 -25,377.45782 c 0,-0.58992 0.98236,-2.45218 2.18303,-4.13836 1.20067,-1.68619 2.61371,-5.13065 3.1401,-7.65438 1.34758,-6.46084 1.8254,-42.8049 0.62168,-47.28526 -0.54625,-2.03318 -3.06341,-6.08318 -5.59369,-9 -2.53027,-2.91683 -5.97211,-8.22832 -7.64853,-11.80332 -2.66151,-5.67576 -3.10797,-7.89488 -3.52075,-17.5 -0.53442,-12.43554 -0.62054,-21.36178 -0.25568,-26.5 0.60185,-8.47556 -0.0397,-31.1683 -0.94868,-33.55923 -0.72706,-1.91231 -0.58769,-4.01425 0.51162,-7.71603 0.831,-2.79826 1.5109,-7.49899 1.5109,-10.44608 0,-6.20317 2.41437,-11.64907 7.96654,-17.96948 2.02478,-2.30496 4.22071,-5.99081 4.87985,-8.1908 0.65913,-2.19998 1.48184,-11.83633 1.82825,-21.41409 0.83084,-22.97155 -0.91591,-33.29974 -6.91545,-40.88972 -7.45409,-9.43013 -8.86809,-14.000274 -9.94805,-32.152724 -1.22142,-20.5302 -0.52079,-76.924222 1.01338,-81.567724 0.6189,-1.873231 2.92539,-5.540703 5.12553,-8.149937 6.4834,-7.688924 7.96482,-12.774628 8.27882,-28.421075 l 0.27113,-13.51005 501.75,-0.0065 c 400.663,-0.0052 501.778,0.245304 501.8892,1.243468 0.6545,5.877895 0.9799,10.66197 1.3093,19.25 0.415,10.818817 1.6302,15.5 4.0239,15.5 0.837,0 3.2106,1.520833 5.2747,3.379628 l 3.7529,3.379629 15.5,1.164767 c 33.0885,2.486475 59.2501,2.682326 68.5,0.512806 3.3,-0.773997 7.1975,-1.413919 8.6611,-1.422049 4.048,-0.02248 7.1829,-4.628357 10.7843,-15.844765 2.7885,-8.684391 3.1642,-11.110725 2.8807,-18.601429 l -0.3261,-8.614342 38.5,0.06572 38.5,0.06572 0.1533,7.707157 c 0.6591,33.129809 0.9576,40.853547 1.6186,41.883454 0.4153,0.646963 0.9698,14.821963 1.2323,31.5 0.4001,25.423274 0.2271,31.188444 -1.0708,35.674654 -0.9834,3.39946 -1.2749,6.49941 -0.7992,8.5 0.804,3.38117 1.0932,8.64832 1.9304,35.149052 0.6595,20.87786 0.6893,17.52945 -0.3955,44.37058 -0.5089,12.5928 -0.5279,23.95693 -0.043,26 0.4734,1.99618 0.8069,7.90442 0.7411,13.12942 -0.066,5.225 0.1917,11.525 0.5723,14 0.4611,2.99857 0.2266,5.66778 -0.7029,8 -1.0885,2.7314 -1.2033,5.58621 -0.5226,13 0.4798,5.225 0.7891,25.7 0.6874,45.5 -0.2699,52.54812 -0.287,63.1573 -0.1454,90.25 0.014,2.6125 0.2557,13.11673 0.538,23.34274 0.4431,16.05594 0.7992,19.22068 2.6098,23.19513 2.3393,5.13518 2.7022,10.72893 0.91,14.02787 -0.6527,1.20134 -1.3259,5.78426 -1.4959,10.18426 -0.1701,4.4 -0.8194,10.78895 -1.4429,14.19768 -0.9564,5.2286 -0.881,6.82906 0.4821,10.23566 1.1763,2.94005 1.4473,5.64853 0.9965,9.96126 -0.5283,5.05429 -0.3062,6.36272 1.5139,8.91871 2.691,3.77919 2.7481,9.13484 0.1329,12.45956 -1.1,1.39842 -2.0025,3.82161 -2.0056,5.38486 0,1.56325 -0.4941,4.60171 -1.0911,6.75214 -0.8405,3.02704 -0.6964,6.6955 0.6382,16.24676 1.6035,11.47543 1.6099,12.74322 0.091,18.15574 -1.8592,6.62607 -2.3245,33.23785 -0.6578,37.62154 0.5362,1.41026 1.1293,11.22706 1.3181,21.8151 0.3495,19.59967 0.725,21.64729 4.6144,25.16717 1.5749,1.42533 2.0926,3.0923 2.0926,6.73881 0,2.93915 -0.4452,4.84501 -1.1317,4.84501 -0.7348,0 -0.9513,1.34435 -0.6174,3.8341 0.2829,2.10876 0.147,4.49049 -0.302,5.29273 -0.6815,1.21777 -0.927,11.31292 -0.7509,30.87317 0.017,1.925 -0.9798,5.43981 -2.2158,7.81068 -2.0452,3.92277 -2.1788,5.09262 -1.4855,13 0.9924,11.31716 1.6005,24.17802 1.4984,31.68932 -0.082,6.00091 -0.051,13.16248 0.099,23.5 0.044,3.025 -0.1622,9.1 -0.4584,13.5 -0.3802,5.64811 -0.1,9.36248 0.9546,12.6345 1.4943,4.63793 3.0781,12.05429 4.0862,19.13431 0.3277,2.30106 0.049,4.3562 -0.7151,5.27707 -1.2264,1.4778 -1.858,25.35817 -1.0963,41.45412 0.1692,3.575 -0.2373,8.3 -0.9032,10.5 -0.666,2.2 -1.6863,9.37347 -2.2674,15.94105 -0.8625,9.74737 -0.7854,13.27229 0.4194,19.18752 0.8118,3.98556 1.1865,8.06209 0.8327,9.05895 -0.6151,1.73326 -0.4318,9.9342 0.5499,24.60319 0.3589,5.36407 0.1444,6.90967 -1.0213,7.35698 -1.6633,0.63841 -2.0977,7.35231 -0.4754,7.35231 1.5599,0 1.174,3.61069 -0.5377,5.03131 -1.1839,0.98251 -1.4285,2.67907 -1.0628,7.37244 0.3389,4.35105 0.063,6.65195 -0.9623,8.03735 -2.1524,2.9072 -1.7403,5.4637 1.0887,6.7527 1.3892,0.6329 2.3642,1.6358 2.1667,2.2285 -0.2561,0.7683 -174.0579,1.1497 -605.39698,1.3285 l -605.03772,0.2508 0.80406,-4.2508 z M 1083,938.42442 c 13.1003,-1.3733 16.4909,-2.99274 21.057,-10.05742 4.0681,-6.29409 6.4474,-14.79276 7.4567,-26.6346 0.5113,-5.99915 0.3274,-7.67405 -1.0045,-9.14577 -0.8968,-0.99091 -2.037,-4.6719 -2.5338,-8.17997 -1.7218,-12.15826 -5.3386,-16.14877 -18.2988,-20.18955 l -8.5246,-2.65785 -31.326,0.52647 c -17.2293,0.28956 -34.8966,1.08094 -39.2607,1.75862 l -7.9348,1.23215 -2.3668,4.75926 c -1.8357,3.69144 -3.4534,5.30993 -7.2101,7.21357 l -4.8433,2.45431 0.4362,11.28643 c 0.2399,6.20754 0.4927,12.18643 0.5617,13.28643 0.069,1.1 1.3567,3.87026 2.8615,6.15614 1.5048,2.28588 3.0406,5.21088 3.413,6.5 1.4009,4.8493 7.7701,16.90731 9.3615,17.7229 2.2275,1.14157 11.3348,2.12541 24.6558,2.66353 14.2271,0.57472 39.8704,2.53286 40.4478,3.08863 0.2462,0.23705 1.1462,0.15686 2,-0.1782 0.8537,-0.33506 5.8272,-1.05735 11.0522,-1.60508 z M 49,870.62948 c 6.325,-0.50345 20.5,-1.20167 31.5,-1.55161 11,-0.34993 22.925,-1.03415 26.5,-1.52049 3.575,-0.48634 11.83033,-0.8972 18.34517,-0.91302 6.51484,-0.0158 14.41251,-0.55904 17.55038,-1.20716 4.34977,-0.89843 9.1382,-0.90587 20.15497,-0.0313 8.93735,0.70949 16.54787,0.81559 19.94961,0.27813 3.02493,-0.47793 22.30087,-0.91987 42.83543,-0.9821 20.53455,-0.0622 37.72328,-0.35277 38.19717,-0.64565 0.47389,-0.29288 14.27289,-0.72207 30.66444,-0.95376 73.37483,-1.03713 100.15053,-1.56637 104.83454,-2.0721 6.87389,-0.74218 110.41313,-2.71873 156.49652,-2.98751 20.64052,-0.12038 40.89052,-0.56228 45,-0.982 C 605.1377,856.6412 621.325,856.189 637,856.05604 c 15.675,-0.13296 35.475,-0.73971 44,-1.34831 8.525,-0.60861 47.225,-1.34855 86,-1.6443 38.775,-0.29576 76.4895,-0.8638 83.81,-1.26233 15.053,-0.81948 14.9059,-0.73958 19.7465,-10.72459 2.925,-6.03346 2.959,-6.75343 0.564,-11.93428 -1.0337,-2.23614 -2.122,-4.79419 -2.4183,-5.68455 -0.2963,-0.89036 -2.713,-2.9078 -5.3705,-4.4832 l -4.8317,-2.86436 -24,-0.14605 c -13.2,-0.0803 -27.6198,-0.48493 -32.0439,-0.89913 -5.9782,-0.55968 -10.1087,-0.33471 -16.0839,0.87601 -6.5664,1.33053 -9.1241,1.42336 -13.956,0.50648 -3.2539,-0.61744 -10.4162,-1.08304 -15.9162,-1.03467 -38.89394,0.34208 -81.95967,1.32062 -92.49866,2.10176 -6.87574,0.50962 -18.35134,0.96987 -25.50134,1.02277 -7.15,0.0529 -29.2,0.29686 -49,0.54212 -33.55129,0.41561 -54.21362,0.75961 -123,2.04783 -14.85,0.2781 -30.375,0.91613 -34.5,1.41782 -4.125,0.5017 -16.275,0.73925 -27,0.5279 -10.725,-0.21134 -23.1,0.0373 -27.5,0.55259 -10.71986,1.25537 -29.71076,2.20627 -36.5,1.8276 -9.29167,-0.51825 -15.47873,-0.32432 -44.79661,1.40411 -15.56313,0.91752 -30.23355,1.40272 -32.60094,1.07824 -2.36738,-0.32449 -7.40891,-0.0764 -11.20339,0.55138 -3.79448,0.62774 -13.9394,1.29901 -22.54425,1.4917 -8.60486,0.19269 -16.14553,0.65957 -16.75706,1.03751 -0.61152,0.37795 -11.53819,0.86505 -24.28149,1.08246 -12.7433,0.2174 -28.59613,0.91865 -35.2285,1.55833 -6.63238,0.63967 -14.99037,0.91846 -18.57331,0.61952 -7.25061,-0.60494 -25.55336,0.61629 -34.01445,2.26958 -3.025,0.59108 -15.85,1.27766 -28.5,1.52574 -29.36344,0.57585 -53.57718,3.51184 -60.97779,7.39375 -4.65906,2.44385 -5.09758,3.01375 -6.84855,8.90034 -2.33983,7.86628 -1.70383,10.45191 3.49774,14.2199 4.06823,2.94702 4.31314,2.99057 16.72864,2.97497 6.92998,-0.009 17.77496,-0.42774 24.09996,-0.93119 z m 227,-79.47019 c 16.775,-0.20041 36.8,-0.69346 44.5,-1.09567 14.92039,-0.77937 20.16121,-0.94866 58.5,-1.88974 31.76209,-0.77964 53.29434,-1.66126 54.19684,-2.21903 0.39517,-0.24423 13.67504,-0.70045 29.51082,-1.01382 15.83579,-0.31338 37.34234,-0.7529 47.79234,-0.97671 10.45,-0.22382 21.925,-0.46553 25.5,-0.53713 3.575,-0.0716 11,-0.0377 16.5,0.0754 5.5,0.1131 12.38895,-0.26738 15.30879,-0.84551 3.22601,-0.63876 12.3892,-0.83363 23.35609,-0.49671 9.96196,0.30604 23.71188,0.0671 30.69121,-0.53336 14.37359,-1.23659 15.73488,-1.28428 30.14391,-1.0559 5.775,0.0915 15.225,-0.36633 21,-1.01747 5.775,-0.65113 12.75,-1.34199 15.5,-1.53523 21.7207,-1.52633 25.27783,-1.57887 29.5,-0.43571 5.28003,1.42957 42.68514,1.94241 51,0.69923 3.025,-0.45228 22.15,-0.97273 42.5,-1.15656 40.033,-0.36163 51.388,-1.23261 54.6587,-4.19252 5.4553,-4.93698 6.9055,-15.28037 3.0231,-21.56216 -4.0229,-6.50919 -6.5722,-6.93622 -36.5008,-6.11413 -27.1843,0.74671 -43.6169,0.87829 -52.181,0.41781 -2.75,-0.14786 -18.275,-0.046 -34.5,0.22641 -16.225,0.27239 -31.10277,0.0913 -33.06171,-0.40238 -2.47504,-0.62376 -5.98369,-0.41945 -11.5,0.66965 -5.99302,1.18321 -16.26996,1.65194 -41.93829,1.91279 -18.7,0.19003 -45.475,0.88268 -59.5,1.53921 -17.00142,0.79587 -28.16622,0.87744 -33.5,0.24476 -4.74169,-0.56245 -11.6656,-0.60041 -17,-0.0932 -4.95,0.47065 -33.075,1.12853 -62.5,1.46196 -51.65965,0.58536 -61.54024,0.83418 -82,2.06492 -5.225,0.31431 -20.75,0.64557 -34.5,0.73615 -13.75,0.0906 -32.01325,0.72353 -40.585,1.40657 -8.57174,0.68304 -20.94674,1.1054 -27.5,0.93858 -13.74736,-0.34997 -62.80781,0.90902 -72.415,1.85831 -3.575,0.35324 -16.85,0.75964 -29.5,0.9031 -31.71678,0.35969 -48.19703,0.95739 -53.5,1.94032 -2.475,0.45876 -7.2,0.93087 -10.5,1.04915 -12.87828,0.46156 -27.13952,2.13312 -29.99218,3.51539 -4.09768,1.98553 -10.76367,15.12727 -9.43961,18.60981 1.00322,2.63867 4.4772,4.28714 9.24689,4.38784 1.75169,0.037 6.1099,0.87726 9.6849,1.86729 6.01123,1.6647 11.1245,1.77045 68,1.40635 33.825,-0.21654 75.225,-0.55768 92,-0.75809 z m 813.7243,-41.79254 c 7.924,0.0684 11.1515,-2.56163 13.8722,-11.3039 2.5548,-8.20924 4.6753,-27.64128 3.3863,-31.03155 -0.4839,-1.27284 -0.6288,-3.86139 -0.3219,-5.75233 0.7318,-4.50973 -2.0103,-13.77586 -5.1977,-17.56382 -2.9203,-3.47058 -11.7242,-6.67109 -20.9632,-7.62079 -11.9117,-1.22444 -58.8935,-1.45482 -66.5,-0.32609 -7.0503,1.04619 -17,5.03969 -17,6.82324 0,0.44297 -1.841,3.13445 -4.0911,5.98108 l -4.0912,5.17569 0.6585,15.16411 c 0.3621,8.34026 1.0416,16.28911 1.5098,17.66411 0.4683,1.375 1.104,3.66738 1.4127,5.09418 0.8942,4.13336 8.2485,12.64478 11.8829,13.75256 3.6907,1.12492 17.5315,2.92284 22.7184,2.95112 1.925,0.0105 10.25,0.46148 18.5,1.00219 8.25,0.54072 20.4,0.74957 27,0.46413 6.6,-0.28545 14.3509,-0.49872 17.2243,-0.47393 z M 252.5,739.06079 c 23.7931,-0.87513 54.16542,-1.48665 63.5,-1.2785 9.19229,0.20498 37.56814,0.15804 65,-0.10753 11.275,-0.10915 21.85,-0.0924 23.5,0.0372 2.79204,0.21936 6.84391,-0.11338 23.5,-1.92981 3.575,-0.38987 14.33999,-0.30348 23.92219,0.19197 11.93524,0.61711 19.33634,0.55953 23.5,-0.18285 6.92605,-1.2349 68.30749,-2.11386 84.07781,-1.20397 3.3,0.1904 11.175,-0.17294 17.5,-0.80744 15.31655,-1.53647 67.96038,-1.69226 74.46927,-0.22037 2.7331,0.61805 5.8831,0.89701 7,0.61991 7.98408,-1.98084 25.42861,-3.68571 35.40802,-3.46045 21.75855,0.49113 55.6132,-0.19606 58.70051,-1.19152 2.20888,-0.71223 5.02325,-0.5846 9.96884,0.45209 3.79007,0.79446 7.13006,1.30355 7.42216,1.13131 0.2922,-0.17225 6.96,-0.85941 14.8174,-1.52703 12.6751,-1.07697 14.8506,-1.02926 19.2909,0.42311 2.7527,0.90034 5.5489,1.30063 6.2139,0.88954 0.6649,-0.41109 11.784,-1.05778 24.709,-1.43708 15.3514,-0.45051 24.8732,-1.15658 27.4602,-2.03627 3.7807,-1.28556 4.0647,-1.68673 6.2631,-8.84663 2.4896,-8.10812 4.2345,-25.8668 4.1266,-42 -0.035,-5.225 0.2624,-12.05268 0.6607,-15.17261 0.5302,-4.15278 0.2818,-7.09996 -0.9269,-11 -1.3316,-4.29635 -1.5448,-7.94013 -1.1018,-18.82739 0.9182,-22.56166 0.2947,-83.75608 -1.1411,-112 -0.4333,-8.525 -0.7082,-24.5 -0.6109,-35.5 0.2425,-27.39325 0.1481,-43.33997 -0.2812,-47.5 -0.4805,-4.65658 -1.4777,-80.62004 -1.2995,-99 0.077,-7.975 0.1111,-17.2 0.075,-20.5 -0.4537,-41.5743 -0.6048,-69.07085 -0.4314,-78.5 0.1163,-6.325 0.036,-29.725 -0.1779,-52 -0.3759,-39.0987 -1.1118,-49.484 -3.73,-52.63873 -2.3726,-2.85881 -7.7434,-5.1335 -16.1576,-6.84321 -4.825,-0.98041 -8.9959,-2.14372 -9.2688,-2.58513 -0.7637,-1.23578 6.09,-6.04342 7.7224,-5.417 2.2943,0.88039 10.322,-4.19109 13.1938,-8.33516 3.1606,-4.56065 3.5063,-10.29981 0.7844,-13.021694 -1.1905,-1.19052 -4.0332,-2.07005 -8.0461,-2.48948 -3.4129,-0.35671 -7.1969,-1.18785 -8.4091,-1.84696 -1.5776,-0.85782 -14.14,-1.31239 -44.2039,-1.59954 -48.5481,-0.46368 -46.25198,-0.4507 -49.5,-0.27992 -3.92391,0.2063 -26.05831,-0.8649 -26.8179,-1.29787 -0.37515,-0.21385 -5.6321,-0.01 -11.6821,0.45394 -18.53888,1.42031 -42.55561,1.76041 -51.5,0.72928 -12.9696,-1.49517 -75.93849,-1.40521 -85.06799,0.12154 -5.07225,0.84824 -11.83266,1.05345 -20.5,0.62227 -14.10054,-0.70146 -20.71808,-0.72668 -32.93201,-0.12548 -4.4,0.21658 -9.575,-0.004 -11.5,-0.49058 -9.74467,-2.46223 -93.39419,-3.93286 -138.5,-2.43494 -20.41934,0.6781 -67.27075,0.56383 -69.80879,-0.17026 -0.99483,-0.28775 -3.29763,0.18334 -5.11734,1.04684 -5.37662,2.55137 -19.02124,3.15839 -26.85176,1.19457 -5.38646,-1.35087 -9.79905,-1.57559 -22.94553,-1.16853 -8.95212,0.27719 -27.52658,0.77397 -41.27658,1.10395 -13.75,0.32998 -26.575,0.98461 -28.5,1.45472 -2.94952,0.72032 -12.73442,0.65907 -30,-0.18779 -1.925,-0.0944 -9.125,-0.13018 -16,-0.0795 -6.875,0.0507 -15.57559,0.0713 -19.33464,0.0458 -6.09282,-0.0414 -7.12235,0.24129 -9.48544,2.60438 -2.28052,2.28052 -2.47823,2.92714 -1.41536,4.62906 0.67949,1.088054 1.23544,3.795514 1.23544,6.016584 0,5.16641 0.88706,5.50399 16.86032,6.41627 6.79817,0.38827 13.54817,1.19492 15,1.79257 1.45182,0.59765 8.03968,1.22972 14.63968,1.4046 6.6,0.17488 12.45,0.33143 13,0.3479 0.55,0.0165 7.975,-0.12132 16.5,-0.30619 8.525,-0.18486 18.2,0.052 21.5,0.52645 3.3,0.47441 12.3,1.28599 20,1.8035 7.7,0.51752 15.8,1.0962 18,1.28596 2.2,0.18977 4.73941,-0.0112 5.64313,-0.44659 1.0738,-0.51734 2.5144,-0.10628 4.15773,1.18636 2.50867,1.97332 6.12675,2.5186 9.11161,1.37321 0.86682,-0.33264 1.32707,-1.00764 1.02277,-1.5 -0.3043,-0.49237 0.22328,-0.89522 1.17241,-0.89522 0.94913,0 1.43142,0.29426 1.07176,0.65392 -0.35965,0.35965 0.70552,1.95307 2.36706,3.54093 3.41331,3.26193 3.11859,4.80515 -0.91766,4.80515 -1.51423,0 -4.61594,0.9 -6.89267,2 -2.27674,1.1 -4.87933,2 -5.78354,2 -1.96622,0 -7.4526,-3.1034 -7.4526,-4.21561 0,-0.43141 -0.7875,-0.7775 -1.75,-0.76908 -1.49555,0.0131 -1.5319,0.15626 -0.25,0.98469 0.825,0.53316 1.05,1.01377 0.5,1.06802 -2.08395,0.20557 -5.15008,0.82948 -9.5,1.93309 -2.475,0.62793 -6.3,0.95464 -8.5,0.72601 -2.2,-0.22862 -10.3,-0.0632 -18,0.36765 -7.7,0.43083 -22.91213,1.01813 -33.80473,1.30512 l -19.80473,0.5218 -6.01093,3.65144 c -7.36684,4.47512 -9.51743,6.70964 -10.91407,11.33996 -0.59505,1.9728 -1.90158,5.61191 -2.9034,8.08691 -2.85528,7.05394 -3.60591,11.64171 -3.92674,24 -0.16421,6.325 -0.6518,13.4021 -1.08355,15.72689 -0.43175,2.32478 -0.33786,8.56547 0.20864,13.86819 0.80931,7.85264 0.68046,11.54982 -0.69454,19.92869 -1.3662,8.32522 -1.47847,11.444 -0.58859,16.35136 0.60478,3.33518 0.86081,8.21517 0.56895,10.84442 -0.29187,2.62925 -0.75609,8.75592 -1.03161,13.61482 -0.27553,4.85891 -0.74595,9.23078 -1.04539,9.71529 -0.29944,0.4845 -0.0438,5.73403 0.56809,11.66563 0.61189,5.93159 1.26357,30.80971 1.44818,55.28471 0.19889,26.3677 0.78258,46.96454 1.43249,50.54843 0.71517,3.94377 0.77923,7.74848 0.18411,10.93404 -0.56203,3.0084 -0.55035,5.83876 0.0304,7.36627 0.60314,1.58639 0.55247,5.93613 -0.14056,12.06596 -0.72653,6.42609 -0.79571,15.81239 -0.2099,28.47879 0.4806,10.39141 0.51741,21.14807 0.0818,23.90368 -0.4356,2.75561 -0.59799,5.32412 -0.36087,5.7078 0.23713,0.38368 0.4744,4.70202 0.52726,9.59632 0.0529,4.89429 0.56121,14.80761 1.12965,22.0296 0.6817,8.6609 0.7024,15.29904 0.0608,19.5 -0.63298,4.14467 -0.62903,9.5124 0.0113,15.36911 0.9463,8.655 1.10811,13.81862 0.73644,23.5 -0.095,2.475 0.077,9.675 0.3822,16 0.30522,6.325 0.78336,23.59546 1.06252,38.3788 0.3642,19.2863 0.97285,29.15998 2.15473,34.95458 0.91456,4.48402 1.43091,10.31976 1.16095,13.1212 -0.26741,2.77498 -0.0378,6.17042 0.51033,7.54542 0.54809,1.375 1.3734,6.325 1.83402,11 1.82309,18.5029 10.01077,34.22284 19.99331,38.38611 5.68939,2.3728 19.85933,3.99313 26.54626,3.03557 3.23792,-0.46366 6.56213,-0.74602 7.38713,-0.62744 4.90177,0.7045 33.54761,1.92746 39,1.665 3.575,-0.17209 14.6,-0.61081 24.5,-0.97495 z m 16.54575,-207.75576 c -1.34984,-0.68309 -3.86531,-3.092 -5.58993,-5.35312 -2.6105,-3.4226 -3.34381,-5.63422 -4.37841,-13.20502 -0.6835,-5.00163 -0.9634,-9.54584 -0.622,-10.09824 0.81496,-1.31863 0.61089,-23.98022 -0.66252,-73.57215 -0.0565,-2.2 0.015,-6.7 0.15883,-10 0.14385,-3.3 -0.082,-11.85 -0.50183,-19 -0.92456,-15.7452 -0.93991,-18.75318 -0.24577,-48.1616 0.64002,-27.11523 1.22499,-29.31287 8.80481,-33.07831 4.15129,-2.06224 5.89628,-2.24013 22,-2.2427 9.62009,-0.002 19.06607,0.0556 20.99107,0.12691 1.925,0.0713 8,-0.20482 13.5,-0.61367 8.88142,-0.66022 10.525,-0.51444 14.6934,1.3032 7.54072,3.28816 9.32043,9.29471 6.66769,22.50368 -0.93916,4.67642 -1.68874,6.01089 -4.27375,7.60851 -3.59653,2.22278 -13.44225,3.99398 -18.58734,3.34378 -4.19605,-0.53027 -11.00013,2.23568 -16,6.50421 l -3.5,2.98806 0.0191,14.35896 c 0.0171,12.82266 0.25314,14.80023 2.20615,18.48318 2.47643,4.66998 7.57446,9.37579 10.15726,9.37579 4.30361,0 13.98196,4.265 17.19057,7.57544 3.13483,3.23433 3.42038,4.06545 3.76906,10.97037 0.55821,11.05426 -0.16981,13.40166 -5.37167,17.32016 -3.26951,2.46289 -6.41382,3.736 -11.71944,4.74513 -7.85423,1.49387 -11.31899,3.48314 -13.92235,7.99343 -2.2669,3.92739 -4.30863,24.61379 -3.33566,33.79625 0.41373,3.90457 0.7464,7.77422 0.73927,8.59922 -0.17238,19.95175 -1.39382,28.54513 -4.79516,33.73624 -0.876,1.33695 -3.11828,3.06822 -4.98283,3.84729 -4.22116,1.76371 -19.02067,1.85948 -22.40859,0.145 z m 103.09493,-1.88591 c -6.08922,-2.58932 -8.95376,-7.14994 -9.66457,-15.38696 -1.86772,-21.64354 -2.88372,-63.46847 -2.17303,-89.45566 0.0827,-3.025 -0.18668,-13.15981 -0.59868,-22.52179 -0.412,-9.36199 -0.78005,-30.12656 -0.8179,-46.1435 -0.0679,-28.75719 -0.0396,-29.17253 2.26811,-33.18219 4.47673,-7.7785 11.33839,-9.62048 24.53334,-6.58587 8.3776,1.92671 10.75736,3.40898 13.16166,8.19797 2.99502,5.9656 3.37545,12.04961 3.86021,61.73538 0.25221,25.85 0.48528,48.35 0.51794,50 0.0326,1.65 0.0293,12.45 -0.008,24 -0.196,61.49976 -0.25521,62.24324 -5.34492,67.11949 -2.6836,2.57105 -3.74832,2.85873 -12.38648,3.34668 -7.46217,0.42151 -10.27055,0.18513 -13.34812,-1.12355 z M 648,529.25996 c -16.96263,-7.26929 -27,-15.99486 -27,-23.47134 0,-1.01867 -1.59953,-3.72081 -3.55451,-6.00477 -3.4623,-4.04492 -3.56816,-4.41927 -4.08032,-14.43 -0.48981,-9.57391 -0.35678,-10.58535 1.94358,-14.77735 2.85428,-5.2014 8.14136,-7.85546 15.82824,-7.94562 7.5185,-0.0882 15.54321,6.41799 22.63563,18.35223 3.23007,5.43514 4.9504,6.59339 9.79312,6.59339 6.15359,0 7.95173,-1.16965 9.98567,-6.49545 4.96578,-13.00269 -4.0317,-28.57167 -25.40547,-43.9609 -10.05216,-7.23761 -21.09093,-18.77248 -28.98495,-30.28758 -9.69523,-14.14255 -13.70033,-36.77428 -9.57255,-54.09194 3.49921,-14.68053 4.47601,-17.15019 8.27882,-20.93131 2.06483,-2.05305 4.45376,-4.85782 5.30875,-6.23282 1.38491,-2.22723 4.96836,-4.91144 16.82399,-12.60216 2.53534,-1.64467 6.35304,-2.6215 13.8515,-3.54417 9.38226,-1.15446 10.63047,-1.1136 13.33103,0.43631 1.63875,0.94051 4.18058,1.71038 5.64851,1.71081 3.9812,10e-4 14.24368,5.28657 17.72287,9.12765 11.37791,12.56138 14.97555,20.9814 14.89964,34.87156 -0.0255,4.675 -0.5855,9.47816 -1.24434,10.67368 -0.65884,1.19553 -3.56294,3.30497 -6.45355,4.68764 -4.67079,2.2342 -5.8611,2.41297 -10.6962,1.60646 -4.75523,-0.79318 -6.17975,-1.6356 -11.30883,-6.68764 -3.22755,-3.17908 -6.78422,-7.39567 -7.90371,-9.37021 -2.07633,-3.6622 -6.40853,-6.90993 -9.21729,-6.90993 -3.42692,0 -8.56857,3.38608 -9.58974,6.31541 -1.63615,4.69347 -1.30433,6.40641 3.01729,15.57604 3.48816,7.40121 5.33578,9.83573 13.17382,17.35855 5.01415,4.8125 9.72477,8.75 10.46805,8.75 0.74327,0 4.19,2.5875 7.6594,5.75 3.46941,3.1625 7.62056,6.92952 9.22478,8.37115 1.60422,1.44163 4.80531,5.26663 7.11352,8.5 2.30821,3.23337 6.0361,8.35385 8.2842,11.37885 2.24809,3.025 4.31752,6.625 4.59871,8 2.10589,10.29733 3.54304,12.17638 7.8218,10.22685 2.23581,-1.0187 2.28825,-1.43583 3.12845,-24.88146 0.46999,-13.11496 0.75561,-26.77039 0.63471,-30.34539 -0.69553,-20.5678 -0.29488,-55.54479 0.71566,-62.47736 1.33279,-9.14327 4.39332,-14.5501 9.44255,-16.68149 1.88951,-0.7976 6.65204,-1.30956 11.75107,-1.26322 7.1169,0.0647 9.32605,0.49213 13,2.5153 3.70755,2.04167 4.55685,3.08425 5.23151,6.42207 0.44297,2.19158 1.5122,7.02786 2.37606,10.74728 0.86386,3.71942 1.73377,12.04442 1.93313,18.5 0.403,13.05043 2.5287,27.78072 4.2586,29.51061 0.8357,0.83575 1.4368,0.81684 2.3268,-0.0732 0.66,-0.66 2.5957,-1.2 4.3015,-1.2 l 3.1015,0 1.2743,-12.75 c 0.7008,-7.0125 1.4032,-15.675 1.561,-19.25 0.7831,-17.74848 4.567,-29.1178 11.0612,-33.23524 2.4879,-1.57735 4.2818,-1.81808 10.5005,-1.40908 4.125,0.27131 8.9544,1.01847 10.732,1.66037 4.3024,1.55358 9.9552,9.38934 11.2469,15.59036 1.1906,5.7149 1.9404,32.45117 2.8718,102.39359 0.6377,47.87952 0.089,65.58683 -2.391,77.12671 -0.6761,3.14621 -4.6271,8.71075 -7.2848,10.25984 -1.0507,0.6124 -3.089,1.94882 -4.5294,2.96982 -1.5563,1.10306 -5.8634,2.27055 -10.614,2.87701 -10.3437,1.32049 -11.8097,0.43783 -15.4115,-9.27935 -4.0063,-10.80854 -4.4559,-13.82781 -5.1265,-34.42635 -0.3564,-10.94729 -1.0662,-19.51277 -1.678,-20.25 -0.5832,-0.70273 -2.0778,-1.27768 -3.3214,-1.27768 -1.6176,0 -2.3969,-0.71139 -2.7389,-2.5 -0.2628,-1.375 -0.09,-2.5 0.3835,-2.5 1.4973,0 0.9303,-4.75954 -0.6387,-5.36163 -0.825,-0.31658 -1.5,-0.10673 -1.5,0.46634 0,0.57307 -0.7875,0.88789 -1.75,0.69961 -1.5106,-0.2955 -1.9191,1.0283 -2.9864,9.67667 -1.0788,8.74258 -2.728,28.07502 -3.76068,44.0851 -0.70957,11.00035 -3.53322,15.94863 -11.35441,19.89791 -1.84331,0.93078 -4.76831,1.72989 -6.5,1.7758 -5.06655,0.13435 -13.87403,-2.11038 -16.09647,-4.10244 -1.12862,-1.01164 -2.84629,-2.11986 -3.81705,-2.46272 -2.11638,-0.74749 -3.37526,-3.83381 -5.30432,-13.00423 -1.8007,-8.56022 -2.65777,-10.11398 -5.59635,-10.14543 -1.39718,-0.0149 -2.33432,-0.62716 -2.33432,-1.52497 0,-0.825 -0.62839,-1.89673 -1.39641,-2.38163 -1.88835,-1.19221 -4.6813,2.51217 -6.57284,8.71778 -2.85512,9.36682 -10.08988,17.57068 -18.53075,21.01294 -2.475,1.00933 -6.975,2.98976 -10,4.40096 -4.61763,2.15418 -7.26474,2.62394 -16.5,2.92811 -9.80889,0.32307 -11.59556,0.10708 -16.5,-1.9947 z m -82.51481,-0.75008 c -5.73045,-2.97166 -8.18112,-6.13737 -9.4043,-12.14824 -0.59152,-2.90683 -1.25071,-18.6331 -1.46487,-34.94727 -0.21415,-16.31417 -0.65971,-30.09954 -0.99012,-30.63415 -0.71365,-1.15472 -0.97219,-21.47241 -0.75334,-59.20372 0.0877,-15.125 -0.14067,-33.05219 -0.50755,-39.8382 -0.55626,-10.28876 -0.35129,-13.66619 1.23397,-20.33299 1.73475,-7.29556 2.28691,-8.31112 6.31311,-11.61157 4.17321,-3.42096 4.87868,-3.63909 13.02935,-4.02878 9.73705,-0.46554 14.81774,1.19396 18.37022,6.00024 3.3368,4.51448 5.50671,25.60063 4.43362,43.08393 -0.48029,7.82505 -0.56873,16.02737 -0.19653,18.22737 1.12587,6.65481 1.74923,58.00144 1.15332,95 -0.062,3.85 0.16743,11.725 0.50986,17.5 0.50915,8.58664 0.27028,11.86669 -1.31085,18 -2.84234,11.02561 -3.35302,11.83685 -9.15047,14.53596 -6.83883,3.18392 -15.57711,3.34723 -21.26542,0.39742 z m -131.8604,-1.40248 c -2.13136,-0.75972 -4.36445,-1.87056 -4.96243,-2.46854 -2.20504,-2.20504 -3.31831,-20.74415 -3.93701,-65.56236 -0.14426,-10.45 -0.5961,-19.52701 -1.00409,-20.17113 -1.26372,-1.99511 -1.26441,-93.81312 -7.9e-4,-103.97862 1.28897,-10.36932 2.21647,-12.32593 7.62347,-16.08211 3.56005,-2.47313 4.59402,-2.66801 14,-2.63873 5.58583,0.0174 11.36238,0.53489 12.83677,1.15 3.87548,1.61686 9.92221,10.46287 13.6164,19.91999 1.76159,4.50967 3.20482,8.55967 3.20717,9 0.002,0.44033 1.35043,2.8256 2.99572,5.3006 1.64529,2.475 2.99336,5.3606 2.99572,6.41245 0.006,2.48375 5.61977,11.22602 7.72904,12.03542 4.54172,1.74283 6.41974,-5.45458 6.64011,-25.44787 0.14891,-13.50962 0.43654,-16.01365 2.23997,-19.5 3.94044,-7.61758 12.51033,-10.87133 22.39058,-8.5011 9.03645,2.16781 12.24151,9.84878 11.95598,28.65271 -0.0822,5.41662 -0.11184,11.87339 -0.0658,14.34839 0.53415,28.69501 0.80706,51.26569 0.90685,75 0.0659,15.675 0.17104,38.72484 0.23363,51.22186 0.12998,25.95485 -1.10255,36.56187 -4.63398,39.87947 -1.90442,1.78912 -3.59499,2.10253 -12.07979,2.23946 -9.80321,0.1582 -9.8926,0.1378 -14.16108,-3.23198 -3.2777,-2.5876 -5.4633,-5.77531 -9.22343,-13.4524 C 490.21752,505.69925 488,500.77703 488,500.29466 c 0,-0.90485 -4.21163,-11.91492 -6.58638,-17.21816 -0.73886,-1.65 -1.75102,-4.8665 -2.24924,-7.14779 -0.49822,-2.28128 -2.24646,-5.88128 -3.88497,-8 -1.63851,-2.11871 -3.75712,-5.98506 -4.70802,-8.59187 -2.00857,-5.50634 -2.61614,-6.0382 -5.94365,-5.20304 -2.09945,0.52692 -2.56045,1.38264 -3.11413,5.78059 -0.35744,2.83916 -1.34854,7.35424 -2.20244,10.03352 -1.35229,4.24304 -1.38052,5.85541 -0.2189,12.5 1.7272,9.87968 1.77546,30.46591 0.0828,35.31262 -0.70764,2.02622 -3.06282,5.28872 -5.23372,7.25 -3.65511,3.30218 -4.40924,3.56272 -10.19422,3.52208 -3.43592,-0.0241 -7.99096,-0.66549 -10.12233,-1.42521 z M 774,457.5765 c 0,-1.1 0.6269,-2 1.393,-2 1.9997,0 2.7668,2.7247 0.9621,3.41724 C 774.1307,459.84729 774,459.76861 774,457.5765 z m -106.5,-329 c 0.33992,-0.55 1.26648,-1 2.05902,-1 0.79254,0 1.44098,0.45 1.44098,1 0,0.55 -0.92656,1 -2.05902,1 -1.13246,0 -1.7809,-0.45 -1.44098,-1 z m -347.5,-1.5 c 0,-0.825 -0.708,-1.5 -1.57332,-1.5 -0.95808,0 -1.44364,-0.68434 -1.24169,-1.75 0.45208,-2.38552 6.97933,-2.96186 8.7931,-0.7764 1.71584,2.06746 0.43736,3.26695 -1.91576,1.7974 -1.80881,-1.12962 -3.06233,-0.763 -3.06233,0.89567 0,0.45833 0.675,0.83333 1.5,0.83333 0.825,0 1.5,0.45 1.5,1 0,0.55 -0.9,1 -2,1 -1.11111,0 -2,-0.66667 -2,-1.5 z m 385,-0.39301 c 0,-1.10907 3.07642,-2.36391 3.86417,-1.57616 0.31785,0.31786 -0.0841,0.99656 -0.89313,1.50823 C 706.10118,127.7981 705,127.82327 705,126.68349 z M 272.46235,122.8265 c 0.9601,-3.88748 1.87895,-4.50725 4.74574,-3.20105 2.21414,1.00883 2.38057,1.42903 1.40213,3.54008 -0.79064,1.70585 -1.93303,2.39761 -3.96863,2.40317 -2.61733,0.007 -2.80112,-0.22413 -2.17924,-2.7422 z m 7.71433,1.08287 c 0.17782,-0.91693 0.85041,-1.84262 1.49463,-2.05711 0.74511,-0.24807 0.97557,0.35856 0.63337,1.66714 -0.63917,2.44419 -2.59595,2.80279 -2.128,0.38997 z M 788,123.0765 c 0,-1.51005 0.5706,-2.5 1.441,-2.5 2.1099,0 2.9129,1.8687 1.5226,3.5438 -1.8039,2.17357 -2.9636,1.76511 -2.9636,-1.0438 z m 6,0.55902 c 0,-1.66931 2.1131,-2.31777 7.1807,-2.2036 6.5879,0.14843 8.3883,1.40224 3.3193,2.31167 -5.7493,1.0315 -10.5,0.9826 -10.5,-0.10807 z m 286.5,437.83353 12,-1.2677 4.2465,-4.53682 c 2.3356,-2.49526 4.687,-5.89835 5.2254,-7.56243 1.1496,-3.55355 1.6277,-16.07075 1.2781,-33.4657 l -0.25,-12.4401 -5.604,-5.17405 c -6.8711,-6.34382 -9.1903,-6.92908 -33.896,-8.5536 -20.3487,-1.33802 -51.3392,-0.64182 -58.9876,1.32516 -4.387,1.12821 -5.2668,1.81634 -7.3053,5.71367 -1.2748,2.43704 -3.6428,5.9402 -5.2624,7.78479 -2.9523,3.36251 -3.763,7.47056 -3.1148,15.78423 0.1286,1.65 0.5765,8.22406 0.9953,14.60901 0.6714,10.23597 1.148,12.39421 4.0297,18.24776 1.7975,3.65132 4.253,7.20226 5.4567,7.89099 2.1755,1.24485 28.5881,1.54172 45.1884,0.50791 4.6636,-0.29044 9.3364,0.14829 14,1.31449 3.85,0.96274 7.675,1.60186 8.5,1.42026 0.825,-0.18159 6.9,-0.90063 13.5,-1.59787 z m 13.7186,-190.04676 c 0.9453,-0.48542 2.9666,-3.0118 4.4918,-5.61418 2.6776,-4.56845 2.78,-5.2661 2.9701,-20.23161 0.2325,-18.30654 -1.518,-32.96193 -4.5472,-38.06863 -3.879,-6.53934 -8.8968,-8.11686 -28.0194,-8.80887 -23.1806,-0.83884 -37.2381,-0.38636 -41.3481,1.33091 -1.8846,0.78741 -8.1153,1.74198 -13.8461,2.12127 -5.7309,0.37928 -10.9796,1.1331 -11.664,1.67514 -0.6843,0.54204 -2.3989,0.7648 -3.8102,0.49501 -1.9225,-0.36751 -2.9559,0.10456 -4.1208,1.88232 -0.8551,1.30507 -2.023,2.37285 -2.5953,2.37285 -0.5723,0 -2.5794,1.17372 -4.4602,2.60826 l -3.4196,2.60827 0.4954,7.14173 c 0.2724,3.92796 1.0182,13.44174 1.6571,21.14174 l 1.1618,14 4.5926,7.25 c 2.5259,3.9875 4.6265,7.30754 4.668,7.37786 0.041,0.0703 12.4505,0.65964 27.5755,1.3096 28.8267,1.23876 67.2853,0.9147 70.2186,-0.59167 z m -7.8252,-187.77184 c 6.2341,-1.35949 7.1452,-2.16871 9.1134,-8.09433 0.889,-2.67655 2.6011,-6.11816 3.8048,-7.64802 2.0698,-2.6308 2.1983,-3.86671 2.3712,-22.8021 0.2039,-22.33098 0.304,-21.96275 -6.9815,-25.68109 -2.0893,-1.06632 -4.0418,-2.57219 -4.3389,-3.34637 -0.2971,-0.77418 -2.8027,-2.85946 -5.568,-4.63396 -4.8727,-3.12682 -5.3558,-3.22514 -15.6611,-3.18721 -5.8483,0.0215 -14.5102,0.59001 -19.2487,1.26331 -6.1747,0.87738 -9.6839,0.92914 -12.3873,0.18269 -4.0289,-1.11245 -22.4119,0.74958 -27.8637,2.82234 -1.5201,0.57793 -4.5345,1.05079 -6.6987,1.05079 -3.9868,0 -7.9349,2.61885 -7.9349,5.26335 0,1.92214 -6.9773,11.86868 -7.9179,11.28738 -2.8495,-1.7611 -4.291,32.53846 -1.5722,37.40904 0.7799,1.39713 2.0842,3.92832 2.8984,5.62488 0.8142,1.69656 2.916,4.62156 4.6706,6.5 l 3.1902,3.41535 21.1154,1.09589 c 24.7562,1.28484 62.016,1.00303 69.0089,-0.52194 z"
+         id="path3113"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#021327"
+         d="m -22.93789,962.3265 c 1.06472,-5.6288 5.57794,-15.67465 7.34705,-16.35352 0.77336,-0.29676 2.30292,-2.64487 3.39903,-5.21802 1.62218,-3.80811 2.01363,-7.09843 2.10421,-17.68671 0.19612,-22.92575 -2.50033,-34.44809 -11.27387,-48.17503 -4.26462,-6.67236 -5.63757,-17.18019 -6.13685,-46.96811 -0.19775,-11.79802 -0.66673,-25.37772 -1.04218,-30.17712 -1.16612,-14.90662 3.02666,-32.9471 9.58035,-41.2218 5.59108,-7.05932 7.2571,-15.66519 6.47555,-33.44969 -0.88184,-20.06674 -2.84968,-26.85841 -10.61017,-36.6192 -4.82808,-6.07253 -5.93386,-8.23271 -6.93775,-13.55316 -0.65684,-3.48108 -0.86523,-7.79138 -0.4631,-9.57844 0.95855,-4.25976 0.96921,-11.37606 0.0408,-27.2492 -0.86375,-14.76803 -0.78521,-24.39348 0.35085,-43 0.87684,-14.36104 1.4175,-15.94523 8.71804,-25.54481 6.62511,-8.71144 7.9422,-13.35695 6.3786,-22.49788 -0.81491,-4.76399 -1.0123,-10.50443 -0.56001,-16.28608 0.87262,-11.15475 -1.51176,-20.16853 -7.41244,-28.0216 -7.71022,-10.26133 -8.8756,-13.96406 -9.4892,-30.14963 -0.30234,-7.975 -0.70622,-17.425 -0.89751,-21 -0.62412,-11.66375 -0.75855,-42.27539 -0.22934,-52.22373 0.55933,-10.5145 1.95347,-14.47016 6.04469,-17.15082 C -26.148,379.28259 -25,378.08687 -25,377.54479 c 0,-0.54209 1.29654,-2.77543 2.8812,-4.963 2.29992,-3.17493 3.04156,-5.54379 3.67597,-11.74134 0.43712,-4.27017 0.72097,-8.08527 0.63078,-8.478 -0.0902,-0.39273 -0.1999,-7.36773 -0.24378,-15.5 -0.0439,-8.13227 -0.51017,-16.44946 -1.03617,-18.48263 -0.52601,-2.03318 -3.0266,-6.08318 -5.55688,-9 -2.53027,-2.91683 -5.97211,-8.22832 -7.64853,-11.80332 -2.66151,-5.67576 -3.10797,-7.89488 -3.52075,-17.5 -0.53442,-12.43554 -0.62054,-21.36178 -0.25568,-26.5 0.60185,-8.47556 -0.0397,-31.1683 -0.94868,-33.55923 -0.72706,-1.91231 -0.58769,-4.01425 0.51162,-7.71603 0.831,-2.79826 1.5109,-7.49899 1.5109,-10.44608 0,-6.14946 2.44728,-11.75409 7.67677,-17.58094 1.87687,-2.09125 3.89614,-5.01625 4.48728,-6.5 3.15893,-7.92888 3.91822,-36.84116 1.32718,-50.53658 -1.67551,-8.85626 -1.58482,-8.64547 -6.18692,-14.37899 -6.87462,-8.56474 -8.42966,-13.744344 -9.49317,-31.620304 -1.22142,-20.5302 -0.52079,-76.924222 1.01338,-81.567724 0.6189,-1.873231 2.86688,-5.473231 4.99551,-8 6.82208,-8.098099 8.07992,-12.313068 8.39905,-28.144976 l 0.28092,-13.936424 501.33599,-0.0064 501.33601,-0.0064 -0.3077,3.75 c -0.1693,2.0625 0.2973,6.155694 1.0368,9.095987 0.7773,3.09094 1.0848,7.240059 0.729,9.83622 -0.3385,2.469629 -0.1002,6.536718 0.5297,9.037976 0.8273,3.285661 0.8476,5.412498 0.073,7.663779 -0.5896,1.713821 -1.3573,4.936861 -1.7059,7.162311 -0.546,3.485171 -0.2613,4.448315 2.0531,6.945516 l 2.6869,2.899243 2.1165,-2.482068 c 1.1642,-1.365137 3.3768,-3.989591 4.917,-5.83212 3.2756,-3.918579 7.1549,-4.988559 14.1996,-3.916513 2.75,0.418488 14.225,0.969294 25.5,1.224012 11.275,0.254718 23.2,0.768124 26.5,1.140902 3.3357,0.376817 9.3303,0.167213 13.5,-0.472036 4.125,-0.632398 10.425,-1.565668 14,-2.073933 3.575,-0.508265 7.7394,-1.214358 9.2543,-1.569096 2.5207,-0.590278 2.9248,-0.259551 4.7646,3.899695 1.5565,3.518678 2.7791,4.798398 5.4157,5.668552 1.873,0.618133 3.9465,1.775859 4.6079,2.572725 0.6613,0.796867 2.1308,1.448848 3.2655,1.448848 1.1347,0 3.0411,0.918798 4.2365,2.041773 1.7847,1.676641 3.6739,2.079011 10.5644,2.25 6.6995,0.166251 8.3911,0.510611 8.3911,1.708227 0,1.458355 -0.7291,1.580524 -11.5,1.927046 -2.4835,0.0799 -2.4798,0.09276 0.5573,1.944786 3.2669,1.992184 8.7577,3.253433 14.4427,3.317484 5.0539,0.05694 8.9985,-0.573948 8.9993,-1.439316 4e-4,-0.4125 0.5332,-0.6375 1.1839,-0.5 0.6508,0.1375 1.8376,-1.065139 2.6373,-2.672531 1.3773,-2.768407 1.5259,-2.824248 2.8168,-1.05887 0.7495,1.025013 1.377,3.240152 1.3945,4.922531 0.028,2.667499 0.1926,2.847563 1.2882,1.40734 1.1275,-1.482048 1.4321,-1.345454 2.9682,1.331039 0.9415,1.640414 1.7118,4.044545 1.7118,5.342514 0,1.297968 0.45,2.638058 1,2.977977 0.55,0.339919 1,1.461152 1,2.491629 0,1.030478 0.9,2.159245 2,2.508371 1.1,0.349126 2,1.495305 2,2.547064 0,1.213654 1.4144,2.633876 3.8715,3.887404 5.1413,2.622878 6.9589,9.385492 3.5384,13.165072 -1.4658,1.61975 -1.399,1.92318 0.8557,3.88361 2.1957,1.90908 2.3575,2.55562 1.5823,6.32171 -1.9447,9.44857 -2.0647,10.73173 -1.116,11.93668 1.308,1.66134 1.0925,24.737028 -0.2319,24.830448 -1.7867,0.12603 -4.5,3.19088 -4.5,5.08301 0,1.77776 -1.0156,2.28303 -3.8242,1.90262 -2.3618,-0.31989 -4.1758,2.1083 -4.1758,5.58959 0,2.6408 -0.5204,3.60017 -2.3252,4.28635 -2.2867,0.8694 -6.3269,5.86499 -5.903,7.29887 0.4091,1.38393 -4.948,2.02572 -11.3953,1.36517 -5.1989,-0.53264 -6.7657,-0.35124 -8.0489,0.93194 -0.8763,0.87633 -2.7713,1.46977 -4.2111,1.31875 -1.4397,-0.15103 -3.2156,0.0949 -3.9464,0.54657 -1.6679,1.03081 -12.494,-0.0861 -18.5758,-1.91652 -2.5269,-0.76047 -4.5943,-1.16248 -4.5943,-0.89337 0,0.26911 -1.8907,-1.32741 -4.2014,-3.54783 -2.3108,-2.22042 -4.7702,-4.03713 -5.4652,-4.03713 -0.6951,0 -2.742,-1.25045 -4.5486,-2.77878 -1.8066,-1.52832 -5.1721,-4.04705 -7.4788,-5.59716 l -4.1939,-2.81839 -13.8061,0.51284 c -7.5933,0.28207 -16.056,0.94995 -18.806,1.48418 -3.3216,0.64527 -6.6784,0.62417 -10,-0.0629 -3.8688,-0.80021 -7.6019,-0.64616 -16.5,0.68089 -6.325,0.94329 -14.0208,2.07761 -17.1017,2.5207 -7.5235,1.082 -12.602,2.84397 -13.2785,4.60697 -0.3166,0.82513 -1.8595,1.45163 -3.575,1.45163 -2.5171,0 -3.2664,0.59454 -4.5147,3.5821 -1.2207,2.92165 -1.3532,6.00998 -0.7188,16.75 0.6459,10.93324 0.1536,29.20412 -0.8937,33.1679 -0.1453,0.55 0.091,3.5875 0.5243,6.75 0.6303,4.59615 1.1524,5.75 2.6019,5.75 0.9973,0 2.4907,0.67738 3.3186,1.50529 1.3404,1.3404 1.897,1.27422 5.0805,-0.60409 3.4734,-2.04935 4.0944,-2.07993 21.8161,-1.07414 20.0135,1.13585 66.4873,0.95214 73.9479,-0.29231 4.227,-0.7051 5.0248,-0.51754 7.8267,1.84006 2.4038,2.0227 4.2039,2.62519 7.8431,2.62519 2.5978,0 5.2527,-0.52937 5.8997,-1.17637 0.9018,-0.90183 1.6624,-0.73653 3.2589,0.70829 1.4485,1.31091 4.4179,2.10774 9.754,2.61743 4.2193,0.40303 7.8302,1.2093 8.0244,1.79171 0.1941,0.58242 0.9354,1.05894 1.6472,1.05894 0.7118,0 1.8527,0.67293 2.5353,1.4954 0.6826,0.82247 2.993,2.0203 5.1343,2.66185 2.1413,0.64154 4.393,1.76861 5.0038,2.5046 0.6108,0.73598 2.1107,1.33815 3.3332,1.33815 1.2224,0 3.037,0.9 4.0325,2 1.2121,1.33941 3.08,2 5.655,2 2.1147,0 3.8578,0.3375 3.8734,0.75 0.042,1.11319 7.4601,9.25 8.4328,9.25 0.4602,0 2.4572,1.66692 4.4378,3.70427 3.5705,3.67286 3.6057,3.79372 4.1597,14.25 0.3377,6.37375 0.1588,11.21366 -0.4521,12.23409 -0.7089,1.18427 -0.5629,3.27426 0.4893,7 1.0904,3.86136 1.471,9.95328 1.394,22.31164 -0.1057,16.95715 -0.6741,21.5 -2.69,21.5 -1.3867,0 -4.7999,3.94621 -4.7999,5.54942 0,1.23731 -4.9649,5.91303 -8.5957,8.09503 -1.6704,1.00391 -1.7407,1.41749 -0.5722,3.3679 1.8336,3.06057 0.047,4.61606 -2.3107,2.01128 -1.939,-2.1426 -7.911,-2.82022 -9.0214,-1.02363 -0.3399,0.55 -1.904,1 -3.4757,1 -1.5717,0 -3.0076,0.42075 -3.191,0.93499 -0.708,1.9859 -19.926,1.45277 -30.3333,-0.84147 -2.75,-0.60623 -6.7354,-1.39095 -8.8565,-1.74383 -3.127,-0.52024 -4.5049,-1.54407 -7.284,-5.4124 -5.8496,-8.14216 -8.9335,-9.15941 -29.8595,-9.84917 -9.9,-0.32632 -18.5028,-0.91933 -19.1174,-1.31779 -1.0312,-0.66854 -10.6363,0.41401 -29.3826,3.31158 -5.6845,0.87864 -9.8205,0.87894 -17.0865,10e-4 C 994.259,299.49316 989,300.18026 989,302.60785 c 0,0.59462 -1.385,2.34614 -3.0778,3.89227 -2.8928,2.64214 -3.1303,3.41584 -3.9515,12.86939 -0.5159,5.93973 -0.5018,11.35472 0.034,13.22452 0.4994,1.74146 0.6454,4.47952 0.3244,6.08458 -0.321,1.60506 -0.071,4.82614 0.5548,7.15796 0.7707,2.87022 0.8593,6.66222 0.2741,11.73966 -0.4754,4.125 -0.6564,8.06504 -0.4022,8.75564 0.2542,0.6906 2.2432,1.54044 4.4201,1.88854 2.1768,0.34809 4.5755,1.25046 5.3303,2.00526 2.11,2.11001 48.3495,3.75422 78.4934,2.79112 24.8207,-0.79302 38.9743,-0.89304 39.3816,-0.27832 0.123,0.18577 0.9979,1.57526 1.9441,3.08776 1.6025,2.5615 2.1863,2.75 8.5169,2.75 6.7077,0 6.8151,0.0424 8.2269,3.25 1.3127,2.98229 1.9659,3.33674 7.9305,4.30299 3.575,0.57914 7.7506,1.58549 9.2792,2.23633 1.5285,0.65085 4.116,1.28522 5.75,1.40973 1.6339,0.1245 2.9708,0.58065 2.9708,1.01366 0,0.43301 0.83,0.78729 1.8445,0.78729 1.0144,0 3.0649,1.04874 4.5566,2.33053 2.3542,2.02285 2.5146,2.49457 1.215,3.57311 -3.1986,2.65459 -0.727,4.09636 7.0223,4.09636 6.1582,0 7.5345,0.29845 8.07,1.75 0.3552,0.9625 1.0368,2.01439 1.5148,2.33753 0.478,0.32314 1.094,3.02314 1.3688,6 1.5177,16.43687 1.5426,18.17335 0.3031,21.16575 -0.7093,1.71237 -1.2407,6.28502 -1.181,10.16145 0.06,3.87643 -0.2695,7.75445 -0.7315,8.61782 -0.5366,1.00265 -0.1101,3.17703 1.1806,6.01861 1.6076,3.53932 1.899,5.66137 1.4252,10.37984 -0.3276,3.26205 -1.2254,6.89221 -1.9951,8.06702 -0.7698,1.17482 -2.3835,5.43961 -3.586,9.47733 -2.0298,6.81587 -2.0779,7.61714 -0.6724,11.19526 0.8326,2.11967 1.0935,3.59414 0.5797,3.2766 -0.5138,-0.31755 -2.0948,0.80192 -3.5133,2.48771 -2.9519,3.50814 -5.4013,3.99113 -5.4013,1.06508 0,-1.79053 -0.6667,-2 -6.3651,-2 -4.851,0 -6.97,0.47578 -8.9078,2 -1.3984,1.1 -3.0341,2 -3.6348,2 -0.9997,0 -1.5083,1.36535 -1.2107,3.25 0.19,1.20353 -9.6938,0.86283 -10.4497,-0.36021 -0.403,-0.65203 -2.0869,-0.8829 -4.0803,-0.55943 -3.7001,0.60046 -9.6688,-1.00807 -8.8224,-2.3776 0.9053,-1.46484 -2.9698,-2.83975 -10.0475,-3.56488 -6.8834,-0.70522 -10.5719,-2.3563 -16.8039,-7.52189 -1.7478,-1.44871 -4.9778,-3.16412 -7.1778,-3.81202 -7.7191,-2.27329 -43.0572,-3.80729 -67.2619,-2.91979 -12.506,0.45855 -24.0058,0.57355 -25.5553,0.25556 -1.8183,-0.37316 -3.4175,-0.0348 -4.5105,0.95429 -0.9313,0.84284 -2.9157,1.39825 -4.4098,1.23424 -1.8216,-0.19996 -2.8664,0.2322 -3.1712,1.31176 -0.25,0.88548 -0.4409,8.80997 -0.4243,17.60997 0.018,9.3261 -0.428,17.17423 -1.0683,18.8151 -1.6823,4.31053 -1.3322,6.97979 1.4013,10.6849 1.375,1.86371 2.5,4.55095 2.5,5.97166 0,2.48544 3.0442,6.83805 9.5162,13.60646 2.9802,3.11664 3.1655,3.16248 15.5,3.8338 7.8285,0.42607 13.7865,0.2895 15.9772,-0.36624 5.533,-1.65618 24.793,-1.29955 31.0751,0.57542 4.632,1.38247 6.8299,1.45782 14.9315,0.51185 17.6036,-2.05544 20.4857,-2.31161 24.8291,-2.20691 2.3809,0.0574 5.5314,0.72614 7.001,1.4861 1.4696,0.75995 5.3715,1.68296 8.6709,2.05112 5.5709,0.62161 8.3335,1.41411 12.7354,3.65341 0.9551,0.48583 3.3476,0.88333 5.3168,0.88333 2.3075,0 4.7823,0.91683 6.9615,2.57905 1.8598,1.41847 4.8672,2.81306 6.6833,3.09907 1.8161,0.28602 3.977,0.86793 4.802,1.29314 0.825,0.4252 3.6058,1.07844 6.1796,1.45164 2.5738,0.3732 5.8191,1.57487 7.2119,2.67039 1.3927,1.09552 4.7948,2.66378 7.5603,3.48503 4.1352,1.22803 5.1293,1.97514 5.5985,4.20743 0.3138,1.49284 0.9585,3.4399 1.4327,4.3268 1.973,3.68976 3.2249,13.67211 2.2739,18.13089 -0.705,3.3059 -0.6169,5.1305 0.3359,6.94889 0.9729,1.85681 1.2311,8.37422 1.0455,26.38677 -0.2086,20.24293 -0.5072,24.41297 -1.9424,27.12124 -0.9327,1.76019 -1.6959,4.51759 -1.6959,6.12756 0,2.8442 -2.0853,5.75348 -3.2728,4.56599 -0.3238,-0.32382 -1.8574,0.0857 -3.408,0.91005 -1.5505,0.82434 -4.7198,2.00768 -7.0428,2.62965 -2.3229,0.62197 -5.6979,2.48313 -7.5,4.13593 -1.802,1.65279 -5.6676,4.14005 -8.5902,5.52724 -4.9392,2.3444 -6.1022,2.48988 -16.5,2.06408 -17.0282,-0.69734 -17.9385,-0.98879 -22.6728,-7.25926 -4.5276,-5.99687 -8.0873,-8.15149 -18.8858,-11.43145 -7.0081,-2.12865 -9.0903,-2.23746 -44.9879,-2.35104 -36.9574,-0.11693 -37.7274,-0.0786 -42.4755,2.11261 -2.6596,1.22744 -5.8096,2.20677 -7,2.17629 -3.1862,-0.0816 -5.0676,0.47107 -7.8826,2.31556 -2.2223,1.45611 -2.6516,2.74645 -3.6469,10.9634 -0.7579,6.25647 -0.8088,10.62587 -0.1553,13.31305 0.5351,2.2 0.9836,6.17614 0.9967,8.83587 0.022,4.48936 2.1098,14.80864 4.1833,20.67879 1.4167,4.01049 10.5311,10.22989 16.3406,11.15035 8.0104,1.26917 45.7792,3.87373 58.5,4.0342 12.2669,0.15474 33.3695,-1.38524 35.2746,-2.57418 1.224,-0.76389 4.2189,-1.68529 6.6555,-2.04756 3.9922,-0.59359 4.6401,-0.39526 6.5555,2.00692 1.3679,1.71548 3.0969,2.66561 4.8508,2.66561 1.6216,0 3.3119,0.83755 4.1739,2.06816 1.2039,1.71877 2.4235,2.04427 7.2191,1.92673 3.1739,-0.0778 7.4185,-0.43432 9.4326,-0.79229 3.1589,-0.56144 3.8821,-0.31496 5.264,1.79414 2.2193,3.3871 5.722,4.75326 12.1868,4.75326 3.0353,0 6.3649,0.45288 7.3992,1.0064 1.3402,0.71729 3.1904,0.56163 6.4406,-0.54184 4.2369,-1.43846 4.7348,-1.42119 7.0224,0.2436 3.0101,2.19058 3.1185,3.33917 0.525,5.55981 -2.1102,1.80679 -2.6509,4.33784 -1.0465,4.8987 0.8071,0.28213 1.3555,7.86257 1.0201,14.1022 -0.052,0.97289 0.8812,3.72359 2.0743,6.11269 1.7623,3.5286 1.9548,4.74491 1.0256,6.48112 -0.6291,1.17553 -1.578,2.13732 -2.1087,2.13732 -0.5306,0 -0.9648,0.93575 -0.9648,2.07946 0,1.78948 0.4176,1.98772 2.995,1.42165 2.6323,-0.57817 3.1284,-0.3154 4.0973,2.17054 0.6751,1.73187 0.8464,5.34823 0.442,9.32835 -0.3633,3.575 -0.8866,10.1 -1.1629,14.5 -0.2762,4.4 -0.9192,8.1488 -1.4289,8.33067 -0.5415,0.19325 -0.5662,1.02443 -0.06,2 0.4768,0.91813 0.7687,3.01933 0.6486,4.66933 -0.1202,1.65 -0.2889,4.0125 -0.375,5.25 -0.088,1.26377 -0.814,2.25 -1.6565,2.25 -0.825,0 -1.5,0.525 -1.5,1.16667 0,0.64166 -0.2971,0.86953 -0.6603,0.50636 -0.3632,-0.36317 -1.269,0.20876 -2.013,1.27094 -0.745,1.06369 -2.8037,2.07159 -4.5828,2.24364 -2.3416,0.22647 -3.578,1.0423 -4.4954,2.96625 -1.3202,2.7687 -5.0815,6.22455 -12.4161,11.40777 -6.6149,4.6746 -9.2217,5.55441 -11.5746,3.9064 -1.4372,-1.00667 -5.4836,-1.3779 -14.8663,-1.36385 -14.2828,0.0214 -16.659,-0.1188 -17.3915,-1.0259 -1.2944,-1.60298 -16.851,-8.44152 -23.2149,-10.20506 -6.337,-1.75607 -10.2585,-1.97284 -35.2082,-1.94626 -15.4423,0.0164 -29.6519,0.27115 -31.5769,0.56601 -8.2641,1.26582 -21.0663,1.69893 -22.2501,0.75275 -0.6875,-0.54942 -3.7249,-1.28957 -6.7499,-1.6448 l -5.5,-0.64587 -1.8612,3.92041 c -1.503,3.16574 -1.6631,4.56568 -0.8318,7.27248 1.0903,3.55025 2.6568,24.59575 2.335,31.3695 -0.1134,2.38605 0.8342,6.54026 2.3336,10.23013 2.7205,6.69526 3.1502,10.22662 1.4512,11.92565 -0.7643,0.76428 -0.4045,1.25286 1.25,1.6973 1.2778,0.34326 3.4482,2.16213 4.8232,4.04194 3.8229,5.22638 5.9285,5.60493 40,7.19136 6.875,0.32011 15.2,0.79598 18.5,1.05749 12.8474,1.01809 27.755,0.23126 42.7121,-2.25438 2.7965,-0.46474 4.5469,-0.10098 7.0966,1.47483 1.8615,1.15045 3.6448,1.83139 3.963,1.51319 0.9693,-0.96932 8.0685,1.86676 10.783,4.30774 1.4051,1.26352 3.3317,2.29731 4.2814,2.29731 0.9497,0 1.97,0.7875 2.2674,1.75 1.0274,3.3247 2.127,4.75 3.6748,4.7632 0.8544,0.01 2.7183,1.2701 4.142,2.8063 1.4237,1.5362 3.0155,2.5292 3.5374,2.2066 0.5219,-0.3225 1.7575,0.094 2.7456,0.9247 0.9882,0.8312 2.6797,2.1461 3.759,2.922 1.6696,1.2004 1.7631,1.6506 0.6275,3.019 -1.2235,1.4742 -49.9583,1.6082 -585.08314,1.6082 l -583.74845,0 0.8039,-4.25 z M 49,870.62948 c 6.325,-0.50345 20.5,-1.20167 31.5,-1.55161 11,-0.34993 22.925,-1.03415 26.5,-1.52049 3.575,-0.48634 11.83033,-0.8972 18.34517,-0.91302 6.51484,-0.0158 14.41251,-0.55904 17.55038,-1.20716 4.34977,-0.89843 9.1382,-0.90587 20.15497,-0.0313 8.93735,0.70949 16.54787,0.81559 19.94961,0.27813 3.02493,-0.47793 22.30087,-0.91987 42.83543,-0.9821 20.53455,-0.0622 37.72328,-0.35277 38.19717,-0.64565 0.47389,-0.29288 14.27289,-0.72207 30.66444,-0.95376 73.37483,-1.03713 100.15053,-1.56637 104.83454,-2.0721 7.0155,-0.75747 111.10845,-2.73427 156.96829,-2.98095 20.9,-0.11242 40.925,-0.55354 44.5,-0.98028 3.575,-0.42673 20.225,-0.88972 37,-1.02886 16.775,-0.13914 35.9,-0.73344 42.5,-1.32066 6.6,-0.58723 30.675,-1.11123 53.5,-1.16445 73.3657,-0.17108 123.8254,-1.14301 130.5985,-2.51552 1.2411,-0.2515 3.8417,-3.12075 6.3652,-7.02283 3.793,-5.86499 4.1955,-7.04322 3.625,-10.61074 -0.9164,-5.73083 -4.2609,-11.75451 -7.1328,-12.84639 -1.3543,-0.5149 -4.5789,-1.90039 -7.1659,-3.07887 -4.4361,-2.02092 -5.9847,-2.12575 -27.2467,-1.84433 -12.3988,0.16411 -26.1631,-0.0668 -30.5872,-0.51315 -6.1078,-0.6162 -9.9791,-0.41941 -16.0839,0.81756 -6.5664,1.33053 -9.1241,1.42336 -13.956,0.50648 -3.2539,-0.61744 -10.4162,-1.08304 -15.9162,-1.03467 -38.89394,0.34208 -81.95967,1.32062 -92.49866,2.10176 -6.87574,0.50962 -18.35134,0.96987 -25.50134,1.02277 -7.15,0.0529 -29.2,0.29686 -49,0.54212 -33.55129,0.41561 -54.21362,0.75961 -123,2.04783 -14.85,0.2781 -30.375,0.91613 -34.5,1.41782 -4.125,0.5017 -16.275,0.73925 -27,0.5279 -10.725,-0.21134 -23.1,0.0373 -27.5,0.55259 -10.71986,1.25537 -29.71076,2.20627 -36.5,1.8276 -9.29167,-0.51825 -15.47873,-0.32432 -44.79661,1.40411 -15.56313,0.91752 -30.23355,1.40272 -32.60094,1.07824 -2.36738,-0.32449 -7.40891,-0.0764 -11.20339,0.55138 -3.79448,0.62774 -13.9394,1.29901 -22.54425,1.4917 -8.60486,0.19269 -16.14553,0.65957 -16.75706,1.03751 -0.61152,0.37795 -11.53819,0.86505 -24.28149,1.08246 -12.7433,0.2174 -28.59613,0.91865 -35.2285,1.55833 -6.63238,0.63967 -14.99037,0.91846 -18.57331,0.61952 -7.25061,-0.60494 -25.55336,0.61629 -34.01445,2.26958 -3.025,0.59108 -15.85,1.27766 -28.5,1.52574 -29.38011,0.57617 -53.58932,3.51266 -60.95606,7.39375 -4.56001,2.40238 -5.11104,3.09872 -6.8954,8.71366 -2.45584,7.72791 -1.75816,10.58103 3.52286,14.40658 4.06823,2.94702 4.31314,2.99057 16.72864,2.97497 C 31.83002,871.55168 42.675,871.13294 49,870.62949 z M 1175,849.5765 c 0,-1.33333 -0.6667,-2 -2,-2 -1.3333,0 -2,0.66667 -2,2 0,1.33333 0.6667,2 2,2 1.3333,0 2,-0.66667 2,-2 z M 276,791.15929 c 16.775,-0.20041 36.8,-0.69346 44.5,-1.09567 14.92039,-0.77937 20.16121,-0.94866 58.5,-1.88974 31.76209,-0.77964 53.29434,-1.66126 54.19684,-2.21903 0.39517,-0.24423 13.67504,-0.70045 29.51082,-1.01382 15.83579,-0.31338 37.34234,-0.7529 47.79234,-0.97671 10.45,-0.22382 21.925,-0.46553 25.5,-0.53713 3.575,-0.0716 11,-0.0377 16.5,0.0754 5.5,0.1131 12.38895,-0.26738 15.30879,-0.84551 3.22601,-0.63876 12.3892,-0.83363 23.35609,-0.49671 9.96196,0.30604 23.71188,0.0671 30.69121,-0.53336 14.37359,-1.23659 15.73488,-1.28428 30.14391,-1.0559 5.775,0.0915 15.225,-0.36633 21,-1.01747 5.775,-0.65113 12.75,-1.34199 15.5,-1.53523 21.68689,-1.52395 25.28314,-1.57782 29.5,-0.44184 5.81791,1.56728 42.43439,2.11501 51,0.76288 3.575,-0.56433 23.6,-1.13558 44.5,-1.26946 34.1715,-0.21887 48.6323,-0.76947 52.2098,-1.98789 0.6654,-0.22662 2.5779,-2.30062 4.25,-4.60888 2.421,-3.34212 3.0402,-5.21413 3.0402,-9.19194 0,-6.08361 -3.9382,-13.00948 -8.4917,-14.9336 -3.0966,-1.30853 -16.8622,-1.51551 -61.0083,-0.91732 -11.55,0.15651 -22.575,0.22874 -24.5,0.16051 -1.925,-0.0682 -16.775,0.085 -33,0.34056 -16.225,0.25553 -31.10277,0.0607 -33.06171,-0.43303 -2.47504,-0.62376 -5.98369,-0.41945 -11.5,0.66965 -5.99302,1.18321 -16.26996,1.65194 -41.93829,1.91279 -18.7,0.19003 -45.475,0.88268 -59.5,1.53921 -17.00142,0.79587 -28.16622,0.87744 -33.5,0.24476 -4.74169,-0.56245 -11.6656,-0.60041 -17,-0.0932 -4.95,0.47065 -33.075,1.12853 -62.5,1.46196 -51.65965,0.58536 -61.54024,0.83418 -82,2.06492 -5.225,0.31431 -20.75,0.64557 -34.5,0.73615 -13.75,0.0906 -32.01325,0.72353 -40.585,1.40657 -8.57174,0.68304 -20.94674,1.1054 -27.5,0.93858 -13.74736,-0.34997 -62.80781,0.90902 -72.415,1.85831 -3.575,0.35324 -16.85,0.75964 -29.5,0.9031 -31.71678,0.35969 -48.19703,0.95739 -53.5,1.94032 -2.475,0.45876 -7.2,0.93087 -10.5,1.04915 -12.87828,0.46156 -27.13952,2.13312 -29.99218,3.51539 -4.09768,1.98553 -10.76367,15.12727 -9.43961,18.60981 1.00322,2.63867 4.4772,4.28714 9.24689,4.38784 1.75169,0.037 6.1099,0.87726 9.6849,1.86729 6.01123,1.6647 11.1245,1.77045 68,1.40635 33.825,-0.21654 75.225,-0.55768 92,-0.75809 z m -23.5,-52.0985 c 23.7931,-0.87513 54.16542,-1.48665 63.5,-1.2785 9.19229,0.20498 37.56814,0.15804 65,-0.10753 11.275,-0.10915 21.85,-0.0924 23.5,0.0372 2.79204,0.21936 6.84391,-0.11338 23.5,-1.92981 3.575,-0.38987 14.33999,-0.30348 23.92219,0.19197 11.93524,0.61711 19.33634,0.55953 23.5,-0.18285 6.92605,-1.2349 68.30749,-2.11386 84.07781,-1.20397 3.3,0.1904 11.175,-0.17294 17.5,-0.80744 15.31655,-1.53647 67.96038,-1.69226 74.46927,-0.22037 2.7331,0.61805 5.8831,0.89701 7,0.61991 7.98408,-1.98084 25.42861,-3.68571 35.40802,-3.46045 21.75855,0.49113 55.6132,-0.19606 58.70051,-1.19152 2.20888,-0.71223 5.02325,-0.5846 9.96884,0.45209 3.79007,0.79446 7.13006,1.30355 7.42216,1.13131 0.2922,-0.17225 6.96,-0.85941 14.8174,-1.52703 12.4358,-1.05664 14.8997,-1.0132 19.0227,0.33536 3.514,1.14939 5.763,1.31124 8.7138,0.62713 2.1875,-0.50716 10.9523,-0.93626 19.4773,-0.95355 18.2478,-0.037 31.3437,-1.35623 34.592,-3.4846 1.3501,-0.8846 2.931,-3.52337 3.7616,-6.27878 0.7881,-2.61409 2.5612,-7.00289 3.9402,-9.75289 3.8001,-7.57808 5.9641,-15.40087 5.0905,-18.4024 -0.4158,-1.42868 -0.8314,-5.0726 -0.9236,-8.0976 -0.092,-3.025 -0.6696,-8.875 -1.2832,-13 -1.539,-10.34506 -1.4256,-19.48734 0.3225,-26 1.7623,-6.56555 1.902,-14.46621 0.399,-22.56634 -0.9246,-4.98362 -0.8086,-7.1103 0.7249,-13.28263 1.786,-7.18855 1.7842,-7.37942 -0.082,-8.74392 -3.698,-2.70405 -3.8964,-20.26062 -0.3167,-28.03211 0.6744,-1.46422 0.6046,-2.82406 -0.2244,-4.37311 -0.6617,-1.23646 -1.3483,-5.98306 -1.5257,-10.548 -0.1774,-4.56494 -0.8069,-9.20496 -1.3989,-10.31115 -0.592,-1.10619 -1.0764,-3.75084 -1.0764,-5.877 0,-2.12616 -0.5006,-4.36639 -1.1125,-4.97829 -1.029,-1.02899 -2.4927,-52.09906 -1.9285,-67.28745 0.5209,-14.0214 0.4289,-26.84553 -0.3051,-42.5 -1.3115,-27.9749 -1.6283,-89.25528 -0.5067,-98 1.0092,-7.86779 1.0992,-10.75913 0.7246,-23.29506 -0.1659,-5.55112 0.084,-6.48565 2.1144,-7.90784 2.1501,-1.506 2.1871,-1.69722 0.558,-2.8884 -0.9737,-0.71205 -1.4227,-1.79623 -1.0162,-2.45397 0.4005,-0.64808 0.2351,-1.48309 -0.3676,-1.85557 -0.6026,-0.37248 -1.1708,-3.35967 -1.2626,-6.6382 -0.092,-3.27853 -0.5825,-6.76789 -1.0906,-7.75413 -0.6332,-1.22908 -0.3272,-3.4522 0.9726,-7.06696 1.5955,-4.43731 1.7471,-6.29412 0.9557,-11.70682 -0.5174,-3.53818 -0.8563,-7.78305 -0.7532,-9.43305 0.3624,-5.80226 0.1808,-9.09587 -1.0753,-19.5 -1.5024,-12.44457 -1.561,-65.90945 -0.075,-68.68561 0.6734,-1.25823 0.5452,-3.07081 -0.4118,-5.82081 -0.7644,-2.19647 -1.3966,-6.15343 -1.4048,-8.79324 -0.01,-2.63981 -0.6636,-6.05367 -1.4562,-7.58635 -1.8293,-3.53729 -7.777,-8.11396 -10.5449,-8.11396 -3.0295,0 -16.3552,-3.06599 -17.3487,-3.99162 -1.1935,-1.112 5.7755,-6.16018 7.5592,-5.47569 3.4862,1.33777 15.0178,-7.70707 16.8311,-13.20152 0.9405,-2.84981 0.7941,-3.7334 -1.0475,-6.319714 -2.2135,-3.10848 -3.0907,-3.45575 -11.5082,-4.55556 -2.75,-0.35931 -5.9,-1.14342 -7,-1.74247 -1.3171,-0.71728 -16.3408,-1.22615 -44,-1.49033 -48.5481,-0.46368 -46.25198,-0.4507 -49.5,-0.27992 -3.92391,0.2063 -26.05831,-0.8649 -26.8179,-1.29787 -0.37515,-0.21385 -5.6321,-0.01 -11.6821,0.45394 -18.53888,1.42031 -42.55561,1.76041 -51.5,0.72928 -12.9696,-1.49517 -75.93849,-1.40521 -85.06799,0.12154 -5.07225,0.84824 -11.83266,1.05345 -20.5,0.62227 -14.10054,-0.70146 -20.71808,-0.72668 -32.93201,-0.12548 -4.4,0.21658 -9.575,-0.004 -11.5,-0.49058 -9.74467,-2.46223 -93.39419,-3.93286 -138.5,-2.43494 -20.41934,0.6781 -67.27075,0.56383 -69.80879,-0.17026 -0.99483,-0.28775 -3.29763,0.18334 -5.11734,1.04684 -5.37662,2.55137 -19.02124,3.15839 -26.85176,1.19457 -5.38646,-1.35087 -9.79905,-1.57559 -22.94553,-1.16853 -8.95212,0.27719 -27.52658,0.77397 -41.27658,1.10395 -13.75,0.32998 -26.575,0.98461 -28.5,1.45472 -2.94952,0.72032 -12.73442,0.65907 -30,-0.18779 -1.925,-0.0944 -9.125,-0.13018 -16,-0.0795 -6.875,0.0507 -15.57559,0.0713 -19.33464,0.0458 -6.09282,-0.0414 -7.12235,0.24129 -9.48544,2.60438 -2.28052,2.28052 -2.47823,2.92714 -1.41536,4.62906 0.67949,1.088054 1.23544,3.795514 1.23544,6.016584 0,5.16641 0.88706,5.50399 16.86032,6.41627 6.79817,0.38827 13.54817,1.19492 15,1.79257 1.45182,0.59765 8.03968,1.22972 14.63968,1.4046 6.6,0.17488 12.45,0.33143 13,0.3479 0.55,0.0165 7.975,-0.12132 16.5,-0.30619 8.525,-0.18486 18.2,0.052 21.5,0.52645 3.3,0.47441 12.3,1.28599 20,1.8035 7.7,0.51752 15.8,1.0962 18,1.28596 2.2,0.18977 4.73941,-0.0112 5.64313,-0.44659 1.0738,-0.51734 2.5144,-0.10628 4.15773,1.18636 2.50867,1.97332 6.12675,2.5186 9.11161,1.37321 0.86682,-0.33264 1.32707,-1.00764 1.02277,-1.5 -0.3043,-0.49237 0.22328,-0.89522 1.17241,-0.89522 0.94913,0 1.43142,0.29426 1.07176,0.65392 -0.35965,0.35965 0.70552,1.95307 2.36706,3.54093 3.41331,3.26193 3.11859,4.80515 -0.91766,4.80515 -1.51423,0 -4.61594,0.9 -6.89267,2 -2.27674,1.1 -4.87933,2 -5.78354,2 -1.96622,0 -7.4526,-3.1034 -7.4526,-4.21561 0,-0.43141 -0.7875,-0.7775 -1.75,-0.76908 -1.49555,0.0131 -1.5319,0.15626 -0.25,0.98469 0.825,0.53316 1.05,1.01377 0.5,1.06802 -2.08395,0.20557 -5.15008,0.82948 -9.5,1.93309 -2.475,0.62793 -6.3,0.95464 -8.5,0.72601 -2.2,-0.22862 -10.3,-0.0632 -18,0.36765 -7.7,0.43083 -22.91213,1.01813 -33.80473,1.30512 l -19.80473,0.5218 -6.01093,3.65144 c -7.36684,4.47512 -9.51743,6.70964 -10.91407,11.33996 -0.59505,1.9728 -1.90158,5.61191 -2.9034,8.08691 -2.85528,7.05394 -3.60591,11.64171 -3.92674,24 -0.16421,6.325 -0.6518,13.4021 -1.08355,15.72689 -0.43175,2.32478 -0.33786,8.56547 0.20864,13.86819 0.80931,7.85264 0.68046,11.54982 -0.69454,19.92869 -1.3662,8.32522 -1.47847,11.444 -0.58859,16.35136 0.60478,3.33518 0.86081,8.21517 0.56895,10.84442 -0.29187,2.62925 -0.75609,8.75592 -1.03161,13.61482 -0.27553,4.85891 -0.74595,9.23078 -1.04539,9.71529 -0.29944,0.4845 -0.0438,5.73403 0.56809,11.66563 0.61189,5.93159 1.26357,30.80971 1.44818,55.28471 0.19889,26.3677 0.78258,46.96454 1.43249,50.54843 0.71517,3.94377 0.77923,7.74848 0.18411,10.93404 -0.56203,3.0084 -0.55035,5.83876 0.0304,7.36627 0.60314,1.58639 0.55247,5.93613 -0.14056,12.06596 -0.72653,6.42609 -0.79571,15.81239 -0.2099,28.47879 0.4806,10.39141 0.51741,21.14807 0.0818,23.90368 -0.4356,2.75561 -0.59799,5.32412 -0.36087,5.7078 0.23713,0.38368 0.4744,4.70202 0.52726,9.59632 0.0529,4.89429 0.56121,14.80761 1.12965,22.0296 0.6817,8.6609 0.7024,15.29904 0.0608,19.5 -0.63298,4.14467 -0.62903,9.5124 0.0113,15.36911 0.9463,8.655 1.10811,13.81862 0.73644,23.5 -0.095,2.475 0.077,9.675 0.3822,16 0.30522,6.325 0.78336,23.59546 1.06252,38.3788 0.3642,19.2863 0.97285,29.15998 2.15473,34.95458 0.91456,4.48402 1.43091,10.31976 1.16095,13.1212 -0.26741,2.77498 -0.0378,6.17042 0.51033,7.54542 0.54809,1.375 1.3734,6.325 1.83402,11 1.82309,18.5029 10.01077,34.22284 19.99331,38.38611 5.68939,2.3728 19.85933,3.99313 26.54626,3.03557 3.23792,-0.46366 6.56213,-0.74602 7.38713,-0.62744 4.90177,0.7045 33.54761,1.92746 39,1.665 3.575,-0.17209 14.6,-0.61081 24.5,-0.97495 z m 16.54575,-207.75576 c -1.34984,-0.68309 -3.86531,-3.092 -5.58993,-5.35312 -2.6105,-3.4226 -3.34381,-5.63422 -4.37841,-13.20502 -0.6835,-5.00163 -0.9634,-9.54584 -0.622,-10.09824 0.81496,-1.31863 0.61089,-23.98022 -0.66252,-73.57215 -0.0565,-2.2 0.015,-6.7 0.15883,-10 0.14385,-3.3 -0.082,-11.85 -0.50183,-19 -0.92456,-15.7452 -0.93991,-18.75318 -0.24577,-48.1616 0.64002,-27.11523 1.22499,-29.31287 8.80481,-33.07831 4.15129,-2.06224 5.89628,-2.24013 22,-2.2427 9.62009,-0.002 19.06607,0.0556 20.99107,0.12691 1.925,0.0713 8,-0.20482 13.5,-0.61367 8.88142,-0.66022 10.525,-0.51444 14.6934,1.3032 7.54072,3.28816 9.32043,9.29471 6.66769,22.50368 -0.93916,4.67642 -1.68874,6.01089 -4.27375,7.60851 -3.59653,2.22278 -13.44225,3.99398 -18.58734,3.34378 -4.19605,-0.53027 -11.00013,2.23568 -16,6.50421 l -3.5,2.98806 0.0191,14.35896 c 0.0171,12.82266 0.25314,14.80023 2.20615,18.48318 2.47643,4.66998 7.57446,9.37579 10.15726,9.37579 4.30361,0 13.98196,4.265 17.19057,7.57544 3.13483,3.23433 3.42038,4.06545 3.76906,10.97037 0.55821,11.05426 -0.16981,13.40166 -5.37167,17.32016 -3.26951,2.46289 -6.41382,3.736 -11.71944,4.74513 -7.85423,1.49387 -11.31899,3.48314 -13.92235,7.99343 -2.2669,3.92739 -4.30863,24.61379 -3.33566,33.79625 0.41373,3.90457 0.7464,7.77422 0.73927,8.59922 -0.17238,19.95175 -1.39382,28.54513 -4.79516,33.73624 -0.876,1.33695 -3.11828,3.06822 -4.98283,3.84729 -4.22116,1.76371 -19.02067,1.85948 -22.40859,0.145 z m 103.09493,-1.88591 c -6.08922,-2.58932 -8.95376,-7.14994 -9.66457,-15.38696 -1.86772,-21.64354 -2.88372,-63.46847 -2.17303,-89.45566 0.0827,-3.025 -0.18668,-13.15981 -0.59868,-22.52179 -0.412,-9.36199 -0.78005,-30.12656 -0.8179,-46.1435 -0.0679,-28.75719 -0.0396,-29.17253 2.26811,-33.18219 4.47673,-7.7785 11.33839,-9.62048 24.53334,-6.58587 8.3776,1.92671 10.75736,3.40898 13.16166,8.19797 2.99502,5.9656 3.37545,12.04961 3.86021,61.73538 0.25221,25.85 0.48528,48.35 0.51794,50 0.0326,1.65 0.0293,12.45 -0.008,24 -0.196,61.49976 -0.25521,62.24324 -5.34492,67.11949 -2.6836,2.57105 -3.74832,2.85873 -12.38648,3.34668 -7.46217,0.42151 -10.27055,0.18513 -13.34812,-1.12355 z M 648,529.25996 c -16.96263,-7.26929 -27,-15.99486 -27,-23.47134 0,-1.01867 -1.59953,-3.72081 -3.55451,-6.00477 -3.4623,-4.04492 -3.56816,-4.41927 -4.08032,-14.43 -0.48981,-9.57391 -0.35678,-10.58535 1.94358,-14.77735 2.85428,-5.2014 8.14136,-7.85546 15.82824,-7.94562 7.5185,-0.0882 15.54321,6.41799 22.63563,18.35223 3.23007,5.43514 4.9504,6.59339 9.79312,6.59339 6.15359,0 7.95173,-1.16965 9.98567,-6.49545 4.96578,-13.00269 -4.0317,-28.57167 -25.40547,-43.9609 -13.29667,-9.57367 -27.70804,-26.24077 -33.75949,-39.04365 -6.15135,-13.01422 -8.1041,-31.46553 -4.79801,-45.33587 3.49921,-14.68053 4.47601,-17.15019 8.27882,-20.93131 2.06483,-2.05305 4.45376,-4.85782 5.30875,-6.23282 1.38491,-2.22723 4.96836,-4.91144 16.82399,-12.60216 2.53534,-1.64467 6.35304,-2.6215 13.8515,-3.54417 9.38226,-1.15446 10.63047,-1.1136 13.33103,0.43631 1.63875,0.94051 4.18058,1.71038 5.64851,1.71081 3.9812,10e-4 14.24368,5.28657 17.72287,9.12765 11.37791,12.56138 14.97555,20.9814 14.89964,34.87156 -0.0255,4.675 -0.5855,9.47816 -1.24434,10.67368 -0.65884,1.19553 -3.56294,3.30497 -6.45355,4.68764 -4.67079,2.2342 -5.8611,2.41297 -10.6962,1.60646 -4.75523,-0.79318 -6.17975,-1.6356 -11.30883,-6.68764 -3.22755,-3.17908 -6.78422,-7.39567 -7.90371,-9.37021 -2.07633,-3.6622 -6.40853,-6.90993 -9.21729,-6.90993 -3.42692,0 -8.56857,3.38608 -9.58974,6.31541 -1.63615,4.69347 -1.30433,6.40641 3.01729,15.57604 3.48816,7.40121 5.33578,9.83573 13.17382,17.35855 5.01415,4.8125 9.72477,8.75 10.46805,8.75 0.74327,0 4.19,2.5875 7.6594,5.75 3.46941,3.1625 7.62056,6.92952 9.22478,8.37115 1.60422,1.44163 4.80531,5.26663 7.11352,8.5 2.30821,3.23337 6.0361,8.35385 8.2842,11.37885 2.24809,3.025 4.31752,6.625 4.59871,8 2.10589,10.29733 3.54304,12.17638 7.8218,10.22685 2.23581,-1.0187 2.28825,-1.43583 3.12845,-24.88146 0.46999,-13.11496 0.75561,-26.77039 0.63471,-30.34539 -0.69553,-20.5678 -0.29488,-55.54479 0.71566,-62.47736 1.33279,-9.14327 4.39332,-14.5501 9.44255,-16.68149 1.88951,-0.7976 6.65204,-1.30956 11.75107,-1.26322 7.1169,0.0647 9.32605,0.49213 13,2.5153 3.70755,2.04167 4.55685,3.08425 5.23151,6.42207 0.44297,2.19158 1.5122,7.02786 2.37606,10.74728 0.86386,3.71942 1.73377,12.04442 1.93313,18.5 0.403,13.05043 2.5287,27.78072 4.2586,29.51061 0.8357,0.83575 1.4368,0.81684 2.3268,-0.0732 0.66,-0.66 2.5957,-1.2 4.3015,-1.2 l 3.1015,0 1.2743,-12.75 c 0.7008,-7.0125 1.4032,-15.675 1.561,-19.25 0.7831,-17.74777 4.5661,-29.11515 11.0612,-33.23703 2.503,-1.58841 4.2441,-1.81672 10.5005,-1.37684 4.125,0.29003 8.9544,1.038 10.732,1.66216 4.2978,1.50904 9.9487,9.32603 11.2469,15.55812 1.1906,5.7149 1.9404,32.45117 2.8718,102.39359 0.6377,47.87952 0.089,65.58683 -2.391,77.12671 -0.6761,3.14621 -4.6271,8.71075 -7.2848,10.25984 -1.0507,0.6124 -3.089,1.94882 -4.5294,2.96982 -1.5563,1.10306 -5.8634,2.27055 -10.614,2.87701 -10.3437,1.32049 -11.8097,0.43783 -15.4115,-9.27935 -4.0063,-10.80854 -4.4559,-13.82781 -5.1265,-34.42635 -0.3564,-10.94729 -1.0662,-19.51277 -1.678,-20.25 -0.5832,-0.70273 -2.0778,-1.27768 -3.3214,-1.27768 -1.6176,0 -2.3969,-0.71139 -2.7389,-2.5 -0.2628,-1.375 -0.09,-2.5 0.3835,-2.5 1.4973,0 0.9303,-4.75954 -0.6387,-5.36163 -0.825,-0.31658 -1.5,-0.10673 -1.5,0.46634 0,0.57307 -0.7875,0.88789 -1.75,0.69961 -1.5106,-0.2955 -1.9191,1.0283 -2.9864,9.67667 -1.0788,8.74258 -2.728,28.07502 -3.76068,44.0851 -0.70957,11.00035 -3.53322,15.94863 -11.35441,19.89791 -1.84331,0.93078 -4.76831,1.72989 -6.5,1.7758 -5.06655,0.13435 -13.87403,-2.11038 -16.09647,-4.10244 -1.12862,-1.01164 -2.84629,-2.11986 -3.81705,-2.46272 -2.11638,-0.74749 -3.37526,-3.83381 -5.30432,-13.00423 -1.8007,-8.56022 -2.65777,-10.11398 -5.59635,-10.14543 -1.39718,-0.0149 -2.33432,-0.62716 -2.33432,-1.52497 0,-0.825 -0.62839,-1.89673 -1.39641,-2.38163 -1.88835,-1.19221 -4.6813,2.51217 -6.57284,8.71778 -2.85512,9.36682 -10.08988,17.57068 -18.53075,21.01294 -2.475,1.00933 -6.975,2.98976 -10,4.40096 -4.61763,2.15418 -7.26474,2.62394 -16.5,2.92811 -9.80889,0.32307 -11.59556,0.10708 -16.5,-1.9947 z m -82.51481,-0.75008 c -5.73045,-2.97166 -8.18112,-6.13737 -9.4043,-12.14824 -0.59152,-2.90683 -1.25071,-18.6331 -1.46487,-34.94727 -0.21415,-16.31417 -0.65971,-30.09954 -0.99012,-30.63415 -0.71365,-1.15472 -0.97219,-21.47241 -0.75334,-59.20372 0.0877,-15.125 -0.14067,-33.05219 -0.50755,-39.8382 -0.55626,-10.28876 -0.35129,-13.66619 1.23397,-20.33299 1.73475,-7.29556 2.28691,-8.31112 6.31311,-11.61157 4.17321,-3.42096 4.87868,-3.63909 13.02935,-4.02878 9.73705,-0.46554 14.81774,1.19396 18.37022,6.00024 3.3368,4.51448 5.50671,25.60063 4.43362,43.08393 -0.48029,7.82505 -0.56873,16.02737 -0.19653,18.22737 1.12587,6.65481 1.74923,58.00144 1.15332,95 -0.062,3.85 0.16743,11.725 0.50986,17.5 0.50915,8.58664 0.27028,11.86669 -1.31085,18 -2.84234,11.02561 -3.35302,11.83685 -9.15047,14.53596 -6.83883,3.18392 -15.57711,3.34723 -21.26542,0.39742 z M 435.5,527.64779 c -4.76892,-1.15089 -7.44137,-2.95527 -7.92404,-5.35015 -1.66242,-8.24842 -2.18222,-19.72014 -2.81937,-62.22114 -0.1649,-11 -0.63222,-20.52701 -1.03848,-21.17113 -1.26148,-2.00007 -1.25939,-93.82819 0.002,-103.97862 1.28897,-10.36932 2.21647,-12.32593 7.62347,-16.08211 3.56005,-2.47313 4.59402,-2.66801 14,-2.63873 5.58583,0.0174 11.36238,0.53489 12.83677,1.15 3.87548,1.61686 9.92221,10.46287 13.6164,19.91999 1.76159,4.50967 3.20482,8.55967 3.20717,9 0.002,0.44033 1.35043,2.8256 2.99572,5.3006 1.64529,2.475 2.99336,5.3606 2.99572,6.41245 0.006,2.48375 5.61977,11.22602 7.72904,12.03542 4.54172,1.74283 6.41974,-5.45458 6.64011,-25.44787 0.14891,-13.50962 0.43654,-16.01365 2.23997,-19.5 3.94044,-7.61758 12.51033,-10.87133 22.39058,-8.5011 9.03645,2.16781 12.24151,9.84878 11.95598,28.65271 -0.0822,5.41662 -0.11184,11.87339 -0.0658,14.34839 0.53415,28.69501 0.80706,51.26569 0.90685,75 0.0659,15.675 0.17104,38.72484 0.23363,51.22186 0.12998,25.95485 -1.10255,36.56187 -4.63398,39.87947 -1.90442,1.78912 -3.59499,2.10253 -12.07979,2.23946 -9.80321,0.1582 -9.8926,0.1378 -14.16108,-3.23198 -3.2777,-2.5876 -5.4633,-5.77531 -9.22343,-13.4524 C 490.21752,505.69925 488,500.77703 488,500.29466 c 0,-0.90485 -4.21163,-11.91492 -6.58638,-17.21816 -0.73886,-1.65 -1.75102,-4.8665 -2.24924,-7.14779 -0.49822,-2.28128 -2.24646,-5.88128 -3.88497,-8 -1.63851,-2.11871 -3.75712,-5.98506 -4.70802,-8.59187 -2.00857,-5.50634 -2.61614,-6.0382 -5.94365,-5.20304 -2.09945,0.52692 -2.56045,1.38264 -3.11413,5.78059 -0.35744,2.83916 -1.34854,7.35424 -2.20244,10.03352 -1.35229,4.24304 -1.38052,5.85541 -0.2189,12.5 1.7272,9.87968 1.77546,30.46591 0.0828,35.31262 -0.70764,2.02622 -3.06282,5.28872 -5.23372,7.25 -3.60602,3.25783 -4.44373,3.55712 -9.69422,3.46361 -3.16092,-0.0563 -7.09712,-0.42816 -8.74712,-0.82635 z M 774,457.5765 c 0,-1.1 0.6269,-2 1.393,-2 1.9997,0 2.7668,2.7247 0.9621,3.41724 C 774.1307,459.84729 774,459.76861 774,457.5765 z m -106.5,-329 c 0.33992,-0.55 1.26648,-1 2.05902,-1 0.79254,0 1.44098,0.45 1.44098,1 0,0.55 -0.92656,1 -2.05902,1 -1.13246,0 -1.7809,-0.45 -1.44098,-1 z m -347.5,-1.5 c 0,-0.825 -0.708,-1.5 -1.57332,-1.5 -0.95808,0 -1.44364,-0.68434 -1.24169,-1.75 0.45208,-2.38552 6.97933,-2.96186 8.7931,-0.7764 1.71584,2.06746 0.43736,3.26695 -1.91576,1.7974 -1.80881,-1.12962 -3.06233,-0.763 -3.06233,0.89567 0,0.45833 0.675,0.83333 1.5,0.83333 0.825,0 1.5,0.45 1.5,1 0,0.55 -0.9,1 -2,1 -1.11111,0 -2,-0.66667 -2,-1.5 z m 385,-0.39301 c 0,-1.10907 3.07642,-2.36391 3.86417,-1.57616 0.31785,0.31786 -0.0841,0.99656 -0.89313,1.50823 C 706.10118,127.7981 705,127.82327 705,126.68349 z M 272.46235,122.8265 c 0.9601,-3.88748 1.87895,-4.50725 4.74574,-3.20105 2.21414,1.00883 2.38057,1.42903 1.40213,3.54008 -0.79064,1.70585 -1.93303,2.39761 -3.96863,2.40317 -2.61733,0.007 -2.80112,-0.22413 -2.17924,-2.7422 z m 7.71433,1.08287 c 0.17782,-0.91693 0.85041,-1.84262 1.49463,-2.05711 0.74511,-0.24807 0.97557,0.35856 0.63337,1.66714 -0.63917,2.44419 -2.59595,2.80279 -2.128,0.38997 z M 788,123.0765 c 0,-1.51005 0.5706,-2.5 1.441,-2.5 2.1099,0 2.9129,1.8687 1.5226,3.5438 -1.8039,2.17357 -2.9636,1.76511 -2.9636,-1.0438 z m 6,0.55902 c 0,-1.66931 2.1131,-2.31777 7.1807,-2.2036 6.5879,0.14843 8.3883,1.40224 3.3193,2.31167 -5.7493,1.0315 -10.5,0.9826 -10.5,-0.10807 z m 392.9708,670.4058 c -1.69,-2.0363 -0.8971,-2.61533 1.3406,-0.97906 0.9946,0.72723 1.3823,1.58548 0.8617,1.90723 -0.5205,0.32174 -1.5116,-0.0959 -2.2023,-0.92817 z"
+         id="path3111"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#000619"
+         d="m -22,964.045 c 0,-4.3945 4.0422,-14.84828 6.94794,-17.9685 4.70115,-5.04817 5.92148,-10.40049 5.70001,-25 -0.22923,-15.11154 -2.00212,-28.25156 -4.60598,-34.13803 -1.0087,-2.28034 -3.73672,-7.00714 -6.06227,-10.50402 -5.24914,-7.89301 -5.89945,-11.89701 -6.4736,-39.85795 -0.50728,-24.70501 -1.30217,-40.86102 -2.07166,-42.10607 -0.7375,-1.19332 1.2461,-14.71226 3.28581,-22.39393 1.9398,-7.3054 3.56804,-10.67134 7.93032,-16.3938 1.84219,-2.41659 3.34943,-5.17742 3.34943,-6.13517 0,-0.95775 0.73346,-4.01239 1.62991,-6.7881 1.42162,-4.40176 1.50289,-7.26621 0.63592,-22.41337 -1.0586,-18.49514 -2.5124,-24.14419 -7.66131,-29.76956 -5.70291,-6.23063 -8.65717,-11.73645 -10.15694,-18.92942 -1.39775,-6.70362 -1.39279,-7.75026 0.0539,-11.36579 1.36883,-3.42104 1.42574,-5.05484 0.40382,-11.59351 -0.6543,-4.18621 -1.32298,-11.66128 -1.48599,-16.61128 -0.16301,-4.95 -0.37303,-10.125 -0.46671,-11.5 -0.27809,-4.08139 0.99062,-31.17677 1.65747,-35.39815 0.33868,-2.14398 1.26477,-5.4514 2.05798,-7.34981 1.51809,-3.63329 8.32237,-13.25204 9.37447,-13.25204 0.33858,0 1.67678,-2.26565 2.97377,-5.03478 2.34506,-5.0068 2.34932,-5.08319 0.76772,-13.75 -1.13266,-6.20673 -1.3994,-11.25518 -0.92672,-17.5398 0.82065,-10.91125 -1.53024,-20.12371 -6.99204,-27.39973 -8.75665,-11.66533 -9.27469,-13.22225 -10.07341,-30.27489 -1.24145,-26.50477 -1.17618,-78.02955 0.10476,-82.69718 0.63339,-2.30801 2.28769,-5.09002 3.67622,-6.18224 2.59985,-2.04504 6.07808,-6.75021 9.16577,-12.39898 1.55958,-2.85316 1.73842,-5.93858 1.56073,-26.92668 -0.22463,-26.53455 0.098,-25.15647 -8.21908,-35.10797 -2.67171,-3.19673 -5.78498,-8.37173 -6.91839,-11.5 -2.02915,-5.60056 -3.61216,-21.03309 -3.40426,-33.18775 0.0517,-3.025 0.0605,-13.825 0.0195,-24 -0.0965,-23.95635 -0.0969,-23.94199 0.97215,-34.5 0.97431,-9.62199 1.88675,-11.69504 8.71508,-19.80042 5.27515,-6.26173 6.36949,-10.50331 7.15891,-27.74724 1.01469,-22.1647 -1.30435,-35.98755 -7.22685,-43.07632 -1.96076,-2.34688 -4.95742,-6.99157 -6.65925,-10.32153 -2.74634,-5.373774 -3.14045,-7.235034 -3.50532,-16.554494 -0.883,-22.55339 -0.86763,-58.21032 0.0312,-72.5 0.98539,-15.665151 1.83987,-18.568234 6.78162,-23.040452 4.45346,-4.030323 6.86147,-11.398781 7.99633,-24.468516 0.59168,-6.814198 0.81593,-13.424807 0.49833,-14.690242 l -0.57739,-2.30079 493.43801,0 c 468.00529,0 493.60969,0.0902 496.76909,1.75 1.832,0.9625 3.6909,2.3125 4.1307,3 0.4398,0.6875 1.5648,1.251687 2.5,1.253748 1.0672,0.0023 2.3745,1.643278 3.5108,4.406864 2.3826,5.794226 3.1011,25.772974 1.126,31.309037 -1.6969,4.75626 -1.7902,9.768973 -0.2346,12.596092 1.3912,2.528169 1.4819,2.846809 2.3317,8.184259 1.1296,7.094196 1.6117,7.12942 3.9456,0.288261 2.5334,-7.426011 9.4058,-16.932701 12.9458,-17.908301 1.2374,-0.341022 8.2855,-0.264502 15.6624,0.170043 32.5192,1.915578 58.1446,2.121165 65.6352,0.526576 7.3576,-1.56628 11.5341,-1.347829 14.3523,0.750688 2.5613,1.907185 9.0254,15.134012 9.408,19.250416 0.4405,4.739793 4.2734,13.097745 6.4144,13.98723 0.8815,0.366212 2.927,0.840234 4.5455,1.053381 1.6185,0.213147 3.2738,0.923143 3.6784,1.577767 0.5328,0.862132 1.3755,0.906113 3.0572,0.15955 3.023,-1.34207 7.5241,-0.08994 11.2271,3.123237 1.5981,1.386634 3.7356,2.521152 4.75,2.521152 1.0145,0 1.8445,0.675 1.8445,1.5 0,0.825 0.4803,1.5 1.0674,1.5 0.5977,0 0.7991,0.845344 0.4577,1.921036 -0.3674,1.15744 0.02,2.449287 0.9745,3.25 6.2468,5.240274 7.5695,7.328374 7.3338,11.577834 -0.1296,2.33688 0.3048,4.78938 0.9655,5.45 0.6756,0.67564 1.2011,3.90428 1.2011,7.37981 0,5.9663 0.1065,6.2228 3.0991,7.46237 l 3.0991,1.28369 -0.7009,6.58763 c -0.3854,3.6232 -0.9111,6.93247 -1.1682,7.35394 -0.8636,1.41619 -2.3291,-0.3615 -2.3291,-2.82533 0,-1.34254 -0.45,-2.44098 -1,-2.44098 -0.55,0 -1,-1.8 -1,-4 0,-3.33333 -0.3333,-4 -2,-4 -1.7333,0 -2,0.66667 -2,5 0,3.29724 -0.4257,5.02305 -1.25,5.06768 -0.6875,0.0372 -0.2375,0.55599 1,1.15281 4.1654,2.00891 1.5861,6.40393 -3.0722,5.23478 -1.9438,-0.48786 -2.7791,-0.13449 -3.6855,1.55918 -0.6447,1.20451 -0.9489,3.043564 -0.6761,4.086794 0.6743,2.57859 -0.4553,3.04997 -4.054,1.69161 -2.7515,-1.03854 -3.4007,-0.85119 -7.0405,2.03155 -3.2001,2.53456 -4.9456,3.1756 -8.647,3.1756 -3.3562,0 -4.8096,0.44848 -5.2604,1.62326 -0.7861,2.04853 -10.4382,6.37674 -14.2204,6.37674 -1.5669,0 -3.3605,-0.6163 -3.9856,-1.36956 -0.6252,-0.75326 -3.2678,-2.17335 -5.8725,-3.15576 -2.6047,-0.9824 -5.809,-2.6161 -7.1207,-3.63043 -1.9936,-1.54175 -4.208,-1.84123 -13.5,-1.82582 -6.1133,0.0101 -14.9167,0.69063 -19.563,1.51222 -6.5621,1.16034 -9.212,1.24165 -11.8706,0.36424 -2.1689,-0.71581 -6.034,-0.87187 -10.552,-0.42605 -3.9212,0.38693 -9.0631,0.88521 -11.4265,1.10729 -2.3633,0.22208 -5.1462,0.8583 -6.1842,1.41383 -1.038,0.55552 -4.5306,1.01004 -7.7612,1.01004 -5.6695,0 -5.9763,-0.13675 -8.8158,-3.92926 -3.3273,-4.44418 -9.9945,-9.179634 -11.8965,-8.449734 -3.4508,1.324174 -4.8013,12.406854 -3.6411,29.878994 0.1826,2.75 0,6.90819 -0.4165,9.24043 -0.5145,2.91491 -0.3555,4.71398 0.5088,5.75534 1.4863,1.79091 1.6938,14.35678 0.6357,38.50423 -1.0552,24.08318 -1.038,24.73177 0.7299,27.42993 0.9897,1.5105 1.2326,2.70255 0.6268,3.07694 -1.4931,0.92276 -1.1854,8.84217 0.4293,11.05043 0.7801,1.06675 1.7703,1.58756 2.2005,1.15735 0.4302,-0.43022 1.1204,-5.15451 1.5337,-10.49843 1.3488,-17.43806 2.841,-22.24724 8.4243,-27.14946 l 3.7693,-3.30949 21.077,0.84551 c 25.2312,1.01217 62.1218,0.98025 69.077,-0.0598 6.3593,-0.95091 8.8467,0.83166 13.4562,9.64326 4.0392,7.7214 11.5786,15.81373 14.7332,15.81373 1.3832,0 2.9396,1.07028 3.9992,2.75 2.0252,3.2104 6.9498,8.25 8.0618,8.25 0.4227,0 1.3306,-0.9 2.0175,-2 1.8987,-3.04031 7.7065,-2.73184 9.8389,0.52258 1.2946,1.97594 2.3822,2.47346 5.0189,2.29589 3.8575,-0.25978 5.067,0.65314 5.5402,4.18153 0.2868,2.13839 0.7971,2.4644 3.5281,2.25387 1.756,-0.13537 3.5109,0.26861 3.8997,0.89774 1.5818,2.55942 1.0803,17.34232 -0.7854,23.14907 -1.025,3.19037 -1.5567,6.2974 -1.1815,6.9045 0.3752,0.60711 0.2368,0.82858 -0.3075,0.49216 -1.0381,-0.64158 -4.3193,5.31158 -4.3193,7.83659 0,0.80634 0.8632,1.46607 1.9182,1.46607 4.5638,0 5.0818,0.87377 5.0818,8.57181 0,6.25101 -0.291,7.51354 -1.9343,8.39301 -2.5229,1.35025 -8.3714,1.32949 -9.7354,-0.0346 -0.6189,-0.61888 -2.5103,-0.79951 -4.4876,-0.42857 -2.5233,0.47339 -3.7648,1.42535 -4.7442,3.63782 -1.6023,3.62005 -4.2811,4.76605 -14.0617,6.01582 -4.1047,0.52451 -7.951,1.35847 -8.5471,1.85326 -0.5962,0.49478 -2.6378,1.09639 -4.5368,1.33691 -1.8991,0.24052 -5.5818,1.25504 -8.1837,2.25449 -4.7142,1.81079 -4.7476,1.80882 -9.5,-0.5589 -4.2555,-2.12016 -6.3888,-2.41382 -19.8053,-2.72624 -8.2699,-0.19258 -17.9449,-0.5992 -21.5,-0.90361 -3.5551,-0.3044 -9.8389,-0.0848 -13.9639,0.4881 -4.125,0.57286 -11.0022,1.53378 -15.2827,2.13537 -11.0538,1.55355 -26.648,-1.38848 -30.3735,-5.73031 -1.4424,-1.68108 -2.3336,-1.95512 -4.0938,-1.25886 -1.2375,0.48951 -2.25,1.53138 -2.25,2.31526 0,0.78388 -0.6284,1.66636 -1.3964,1.96107 -1.8869,0.72409 -2.6605,7.18367 -3.5024,29.24652 -0.7005,18.35738 -0.7336,18.56454 -3.3095,20.73712 -2.2056,1.86027 -2.7019,3.30062 -3.2586,9.45714 l -0.6567,7.26264 3.0322,0.60644 c 3.796,0.7592 4.1324,1.8953 3.6222,12.23158 -0.375,7.59725 -0.1826,8.72796 2.1004,12.34448 1.3822,2.18965 2.7484,3.74598 3.0358,3.45852 1.0407,-1.0407 8.333,-13.90886 8.333,-14.70461 0,-0.44909 1.2375,-1.79448 2.75,-2.98976 2.7003,-2.13399 3.1111,-2.15838 22.75,-1.3511 11,0.45218 33.1097,0.70633 49.1326,0.56479 l 29.1326,-0.25735 0.6843,2.72639 c 0.3763,1.49952 1.979,4.36111 3.5614,6.35909 2.6707,3.37208 4.7108,7.8833 7.0674,15.62801 1.3404,4.40532 3.5415,6.07676 5.9893,4.54808 2.8662,-1.78997 7.3525,-1.43382 10.2053,0.81016 1.3984,1.1 2.8379,2 3.1989,2 0.361,0 3.1159,1.125 6.1219,2.5 3.0061,1.375 6.7757,2.5 8.3769,2.5 3.0964,0 5.0257,1.76622 3.1772,2.90865 -1.3166,0.81369 2.8911,7.50856 5.3,8.43295 1.3331,0.51156 1.4789,2.7065 1.0545,15.87602 -0.271,8.40531 -0.7685,16.96532 -1.1057,19.02224 -0.4752,2.89912 -0.2515,3.87859 0.9952,4.35699 0.8845,0.33942 1.6082,1.46898 1.6082,2.51014 0,1.41607 -0.7205,1.89301 -2.8599,1.89301 -1.8833,0 -3.5011,0.85374 -4.7374,2.5 -1.1846,1.57748 -2.8661,2.5 -4.5567,2.5 -1.4736,0 -2.8293,0.38012 -3.0127,0.84471 -0.1833,0.46459 -1.6692,1.47709 -3.3019,2.25 -2.0629,0.97655 -3.2844,2.53128 -4.0035,5.09598 -0.9136,3.25837 -6.6637,9.80931 -8.6102,9.80931 -0.3971,0 -1.1805,1.31513 -1.7408,2.92252 -1.4809,4.2479 -4.3595,5.3744 -12.3506,4.83309 -5.3662,-0.36349 -7.4223,-0.96686 -9.2972,-2.72829 -1.3241,-1.24387 -5.0223,-2.89599 -8.2182,-3.67137 -9.4839,-2.30088 -43.5479,-3.96425 -66.8109,-3.26241 -23.8344,0.71908 -24.1128,0.64829 -29.2116,-7.42875 -3.0213,-4.78603 -5.2069,-7.13836 -6.717,-7.22936 -2.8218,-0.17005 -6.6739,2.82701 -7.2342,5.62844 -0.3275,1.63776 -0.9874,3.21994 -1.4664,3.51596 -0.4789,0.29601 -0.8708,1.4382 -0.8708,2.5382 0,1.1 0.45,1.72189 1,1.38197 0.55,-0.33992 1,-0.14148 1,0.44098 0,0.58246 -0.45,1.05902 -1,1.05902 -1.3114,0 -1.2975,4.69811 0.016,5.51008 1.2816,0.79206 0.1756,2.72056 -1.2816,2.23481 -0.5952,-0.19838 -1.2553,-1.65433 -1.4671,-3.23545 -0.3912,-2.92116 -2.9498,-5.68312 -4.7676,-5.14658 -1.8618,0.54952 -1.7284,11.56213 0.1968,16.24423 1.765,4.29254 4.3032,5.94973 4.3032,2.80958 0,-2.45632 2.4568,-1.05628 2.8472,1.62247 0.1909,1.31037 1.0379,2.88761 1.8823,3.50498 1.3735,1.00438 1.359,1.39124 -0.1384,3.67655 -1.5549,2.37304 -1.5566,2.67095 -0.024,4.20338 1.0605,1.06046 1.4677,2.61807 1.1406,4.36264 -2.7227,14.52009 -2.7094,14.09572 -0.5554,17.74659 2.578,4.36925 1.9221,6.52906 -1.7789,5.85794 -1.5032,-0.27257 -3.0552,-0.69469 -3.449,-0.93804 -1.2387,-0.7656 -5.2843,3.15522 -4.5243,4.38487 0.395,0.63907 2.0094,1.16195 3.5877,1.16195 4.8758,0 6.233,2.36864 5.9684,10.4159 -0.5684,17.28712 -0.2819,19.09913 3.6787,23.2629 l 3.6348,3.8212 1.7122,-4 c 0.9417,-2.2 2.0336,-5.72545 2.4264,-7.83433 1.0928,-5.86694 6.094,-13.33499 9.3578,-13.9734 1.5038,-0.29414 6.5229,-0.0767 11.1538,0.48319 5.8815,0.71112 10.1018,0.69266 14,-0.0612 8.6964,-1.68185 28.7196,-1.50408 34.4161,0.30555 3.7981,1.20654 6.3733,1.34248 12,0.63348 3.9403,-0.4965 10.7058,-1.16043 15.0344,-1.47541 l 7.8703,-0.57268 3.6297,3.7924 c 3.368,3.51887 7.0967,8.0209 10.4327,12.59652 1.1977,1.64268 2.8072,1.90816 12.126,2 10.4758,0.10325 10.8055,0.1762 13.1581,2.91166 1.3271,1.54317 2.413,3.40226 2.413,4.13131 0,0.72906 1.5755,2.52722 3.5011,3.99593 1.9255,1.46871 4.2447,4.10861 5.1537,5.86644 0.9091,1.75782 4.2706,5.83836 7.4702,9.06785 4.7672,4.8118 5.6421,6.1994 4.8462,7.68651 -1.8322,3.42356 -1.1587,6.92442 1.5288,7.9462 2.0199,0.76798 2.5,1.63351 2.5,4.50737 0,1.95628 0.5857,5.00491 1.3016,6.77475 1.5775,3.89992 1.1088,7.08935 -0.9269,6.30816 -1.9858,-0.76202 -2.9636,2.23706 -1.4957,4.58755 1.6504,2.64272 0.3824,8.61188 -2.113,9.9474 -1.8234,0.97584 -1.9637,1.85646 -1.5788,9.90731 0.3515,7.35265 0.1614,8.92511 -1.1324,9.36537 -0.8551,0.291 -2.7428,1.4964 -4.1947,2.67866 -3.788,3.08437 -19.7434,4.81901 -23.0463,2.50555 -1.5158,-1.0617 -4.4688,-1.58212 -8.9773,-1.58212 -3.6952,0 -7.0103,-0.47223 -7.367,-1.0494 -0.3928,-0.63554 -1.5804,-0.044 -3.0113,1.5 -2.7889,3.00923 -5.6391,3.19947 -13.9981,0.93432 -11.4452,-3.10142 -14.784,-3.34267 -49.2547,-3.55882 -26.5315,-0.16638 -36.0766,0.10526 -40.5272,1.15334 l -5.8219,1.37097 -3.8855,-4.4252 c -2.137,-2.43387 -3.9047,-4.95739 -3.9282,-5.60782 -0.052,-1.44987 -2.8465,-2.3882 -5.5426,-1.86128 -1.1,0.21498 -2.2857,0.4253 -2.635,0.46738 -0.3492,0.0421 -1.3368,1.14763 -2.1946,2.45678 -1.3329,2.03429 -1.426,4.13972 -0.6408,14.48532 0.5054,6.65778 0.6441,12.82113 0.3083,13.69634 -0.3359,0.8752 -1.7337,2.01825 -3.1063,2.5401 -2.3635,0.89862 -2.4063,1.04742 -0.8091,2.81236 1.1797,1.30356 1.6198,3.3251 1.4646,6.72746 -0.1221,2.67516 0.3414,5.91652 1.0299,7.20303 4.8217,9.00942 5.9777,19.81142 4.1733,38.99493 -0.9751,10.36758 -0.4681,14.18266 2.098,15.78493 1.8788,1.17313 3.7219,1.32958 4.3171,0.36645 0.5283,-0.8548 1.7166,-10.3892 1.8945,-15.20008 0.069,-1.8633 1.1926,-3.52584 3.6001,-5.32603 3.8765,-2.89871 1.5133,-2.86112 29.5,-0.46913 7.15,0.6111 26.95,1.11724 44,1.12475 l 31,0.0137 4.342,4.18282 c 2.3882,2.30055 4.7362,5.18672 5.218,6.41372 0.5639,1.43605 1.4188,2.02259 2.3996,1.64625 0.8871,-0.34044 1.7806,0.0853 2.139,1.0191 0.3384,0.88206 1.2726,1.60375 2.0758,1.60375 1.0053,0 1.2626,0.62322 0.8256,2 -0.423,1.33273 -0.1797,2 0.7292,2 1.7581,0 5.142,2.52669 9.8021,7.31894 3.1097,3.19798 4.6342,3.94388 9.3757,4.58731 4.4748,0.60725 6.4226,1.484 9.2886,4.18106 7.8426,7.38005 10.3044,10.14435 10.3044,11.57047 0,0.81734 1.1091,3.37855 2.4646,5.69158 2.7886,4.75843 2.5155,7.78816 -0.8653,9.59747 -1.7656,0.94496 -2.1439,1.85911 -1.8098,4.3739 0.2323,1.7486 1.1035,3.71819 1.9359,4.37686 1.3268,1.04989 1.2213,1.56578 -0.8559,4.18273 -1.3032,1.64182 -3.5795,3.43241 -5.0584,3.97909 -2.2677,0.83824 -2.7377,1.67132 -3,5.31728 -0.2407,3.34527 -0.6958,4.29376 -2.0114,4.1927 -1.1234,-0.0863 -2.311,1.35461 -3.5,4.24625 -1.1563,2.81209 -2.4253,4.3782 -3.5497,4.38061 -1.0579,0.002 -1.75,0.7633 -1.75,1.92429 0,1.30863 -0.9292,2.12464 -2.9165,2.56111 -1.604,0.35231 -3.1649,1.28807 -3.4686,2.07946 -0.7275,1.89583 -4.5192,1.85173 -5.2533,-0.0611 -0.3166,-0.825 -1.6259,-1.5 -2.9096,-1.5 -1.2837,0 -2.6121,-0.45 -2.952,-1 -1.1501,-1.86091 -3.4583,-1.01425 -4.0894,1.5 -0.3451,1.375 -1.2536,2.5 -2.019,2.5 -0.7954,0 -1.3916,1.01037 -1.3916,2.35842 0,1.75838 -1.4448,3.31772 -5.6788,6.12891 -4.7943,3.18327 -5.9735,3.58639 -7.5715,2.58843 -1.041,-0.65013 -5.6564,-2.27272 -10.2564,-3.60575 -8.3236,-2.41207 -8.5186,-2.4206 -40.6785,-1.77923 -50.5926,1.00897 -45.6399,1.18388 -47.876,-1.69078 -1.0696,-1.375 -2.2034,-3.625 -2.5196,-5 -1.3456,-5.85243 -2.3316,-6.68984 -9.2215,-7.83152 -3.6327,-0.60197 -6.7536,-0.94591 -6.9352,-0.76432 -0.1816,0.18159 -0.3664,2.52745 -0.4108,5.21301 -0.044,2.68555 -0.5459,5.45943 -1.1146,6.16415 -1.1802,1.46252 -0.3644,18.86821 1.3695,29.21868 1.2888,7.69325 1.9153,19.47219 2.2342,42 0.1284,9.075 0.6205,21.3375 1.0936,27.25 l 0.8602,10.75 -504.64732,0 -504.64728,0 0,-2.5315 z m 60.5,-92.07039 c 8.8,-0.3289 16.29594,-0.7789 16.65765,-1 0.58228,-0.35592 18.15373,-1.22805 38.34235,-1.90306 3.85,-0.12872 14.425,-0.72637 23.5,-1.3281 9.075,-0.60173 17.25463,-0.86557 18.17696,-0.5863 0.92232,0.27927 4.00506,-0.25373 6.85053,-1.18443 4.56901,-1.49445 6.76863,-1.56431 18.82305,-0.59781 9.107,0.73018 21.69045,0.81055 37.81152,0.24151 13.28913,-0.46908 25.66413,-0.70933 27.5,-0.5339 1.83587,0.17544 17.28794,-0.0797 34.33794,-0.56695 36.12611,-1.03242 75.57165,-1.92213 111.5,-2.51494 14.025,-0.2314 31.8,-0.66851 39.5,-0.97133 7.7,-0.30283 29.20272,-0.70014 47.78383,-0.8829 18.58111,-0.18277 39.95611,-0.69197 47.5,-1.13156 7.54389,-0.43958 31.26617,-0.91633 52.71617,-1.05944 67.9559,-0.45336 107.79685,-1.29873 113.10086,-2.39984 3.31331,-0.68784 33.03256,-1.17136 83.60176,-1.36017 43.15348,-0.16111 78.99538,-0.6232 79.64848,-1.02684 0.6531,-0.40365 7.4168,-0.72817 15.0304,-0.72116 17.1357,0.0158 24.4913,-1.48527 28.3297,-5.78126 1.749,-1.95747 2.5041,-3.6679 2.0927,-4.74014 -0.4685,-1.22079 -0.2831,-1.4547 0.6807,-0.85903 0.8878,0.54871 1.0859,0.43258 0.6008,-0.35226 -0.398,-0.64395 -1.0953,-0.94107 -1.5497,-0.66026 -1.081,0.66807 -2.0357,-1.91178 -2.0357,-5.50071 0,-1.57256 -0.45,-3.13731 -1,-3.47723 -0.55,-0.33992 -1.0069,-2.05398 -1.0153,-3.80902 -0.021,-4.40777 -0.7011,-5.10217 -6.9847,-7.13318 -3.025,-0.97775 -6.9658,-2.4759 -8.7574,-3.32922 -2.7738,-1.32114 -8.5641,-1.53049 -39,-1.41006 -19.6584,0.0778 -39.7926,0.0921 -44.7426,0.0318 -4.95,-0.0603 -14.625,-0.0842 -21.5,-0.0532 -6.875,0.0311 -18.35,0.003 -25.5,-0.0616 -7.15,-0.0649 -14.575,-0.0745 -16.5,-0.0213 -1.925,0.0532 -13.6905,0.30864 -26.14556,0.56766 -12.45506,0.25903 -23.1231,0.76609 -23.70676,1.12681 -0.58366,0.36072 -16.26816,0.92927 -34.85444,1.26345 -47.34996,0.85133 -48.98154,0.85183 -56.62955,0.0172 -3.92993,-0.42888 -9.24417,-0.31034 -12.5,0.27884 -5.22393,0.94534 -34.36488,1.66911 -99.22614,2.4645 -14.05935,0.17241 -26.65935,0.67872 -28,1.12513 -1.34065,0.44641 -15.03755,0.91164 -30.43755,1.03385 -26.16622,0.20764 -32.90783,0.46887 -49.5,1.91806 -9.63816,0.84181 -9.72289,0.84181 -20.06613,-2.7e-4 -6.02196,-0.49028 -11.94982,-0.37446 -16,0.31259 -7.41795,1.25835 -40.79381,2.76991 -48.93387,2.21617 -7.23067,-0.49188 -9.46328,-0.39771 -22.5,0.94907 -6.05,0.625 -15.725,1.23455 -21.5,1.35457 -5.775,0.12001 -11.02874,0.54788 -11.67498,0.95081 -0.64623,0.40294 -12.88106,0.90827 -27.1885,1.12295 -14.30744,0.21467 -26.50627,0.69485 -27.10851,1.06706 -0.60224,0.3722 -11.76741,0.83368 -24.8115,1.0255 -16.93581,0.24904 -25.97271,0.81798 -31.60789,1.98995 -4.34026,0.90265 -11.31526,1.58561 -15.5,1.51768 -12.86885,-0.20889 -38.58818,0.9152 -45.78191,2.00093 C 36.57202,840.15992 29.225,841.1082 24,841.70052 11.69205,843.09577 7.80077,845.1908 4.48026,852.20979 0.76528,860.06261 1.1454,864.12936 6.0923,869.4564 l 4.06737,4.37991 6.17016,-0.63186 C 19.72343,872.85692 29.7,872.30349 38.5,871.97459 z m 210.6446,-80.30636 c 3.30225,-0.67447 17.62353,-1.04731 37.3554,-0.97251 17.6,0.0667 35.825,-0.15767 40.5,-0.49865 12.00438,-0.87555 28.29557,-1.44103 60,-2.08263 15.125,-0.30609 29.975,-0.77197 33,-1.03531 11.87987,-1.03416 30.54261,-1.73527 53,-1.99106 63.65568,-0.72505 91.9454,-1.40863 96.5,-2.33177 4.40977,-0.89379 25.76764,-0.716 27.38502,0.22796 0.33824,0.19742 6.46498,-0.0518 13.61498,-0.55385 7.15,-0.50203 22.225,-1.09988 33.5,-1.32855 11.275,-0.22867 28.825,-1.19995 39,-2.15841 21.21531,-1.99841 32.6029,-2.18505 35.5956,-0.5834 1.47621,0.79005 10.69581,0.94261 31.49579,0.52119 16.17474,-0.32771 43.58361,-0.64285 60.90861,-0.7003 32.7568,-0.10863 49.1322,-0.92787 57.2936,-2.86635 3.8197,-0.90724 5.5432,-2.06294 8.4829,-5.68834 2.0291,-2.50237 4.0278,-4.69754 4.4415,-4.87815 1.4174,-0.6187 -2.0314,-5.67366 -8.4088,-12.3252 -4.7676,-4.97257 -7.3811,-6.89028 -10.3443,-7.59047 -4.2475,-1.00366 -30.2454,-0.80277 -47.4649,0.36677 -5.775,0.39224 -15,0.60803 -20.5,0.47954 -16.903,-0.39489 -27.01656,-0.38394 -53.5,0.058 -14.28066,0.23828 -26.75705,0.0172 -28.3571,-0.50253 -1.9102,-0.62044 -4.72729,-0.5067 -8.5,0.34321 -6.87919,1.54971 -17.36924,1.97938 -58.1429,2.38153 -17.325,0.17087 -38.7,0.85175 -47.5,1.51306 -11.19721,0.84145 -19.74048,0.91662 -28.46104,0.25041 -7.97198,-0.60902 -16.07755,-0.60251 -22.5,0.0181 -5.52143,0.53351 -33.66396,1.17963 -62.53896,1.43582 -49.89304,0.44266 -59.09034,0.6519 -82.5,1.8769 -12.85022,0.67244 -37.86217,0.98446 -47.5,0.59256 -4.125,-0.16773 -10.875,0.24071 -15,0.90764 -4.125,0.66693 -18.525,1.3493 -32,1.51638 -36.99959,0.45877 -77.05037,1.49812 -81.14386,2.10577 -3.23237,0.47982 -38.60889,1.30929 -58.85614,1.37999 -4.125,0.0144 -11.775,0.49277 -17,1.06303 -10.38376,1.1333 -20.36233,1.85727 -32.08105,2.32756 -11.3205,0.45431 -14.56452,2.4019 -19.02261,11.4205 -3.93676,7.96394 -4.08799,11.82003 -0.51552,13.1446 1.16555,0.43216 4.97365,1.10073 8.46244,1.48572 3.48879,0.38499 7.53879,1.20231 9,1.81627 1.46121,0.61395 5.35674,1.37436 8.65674,1.68979 11.00245,1.05167 117.94339,0.3297 123.6446,-0.83474 z m -13.78846,-52.28243 c 1.24134,-0.66429 3.25537,-0.64097 6.08053,0.0704 2.90861,0.73239 6.16699,0.75087 10.46117,0.0593 6.03982,-0.97268 50.91351,-2.18913 64.10216,-1.7377 13.22523,0.45268 46.00942,0.24579 62.5,-0.39442 9.92262,-0.38522 18.83221,-0.2584 21.40101,0.30462 3.01409,0.66062 7.42602,0.57762 14,-0.26337 10.96366,-1.40256 36.79477,-1.86073 39.2189,-0.69563 0.89095,0.42822 7.19095,0.3035 14,-0.27715 13.6066,-1.16032 71.01088,-2.12756 93.38009,-1.57341 3.3,0.0817 9.825,-0.28777 14.5,-0.82115 7.95199,-0.90726 62.33724,-1.14445 79,-0.34454 4.125,0.19802 11.55,-0.26138 16.5,-1.02089 7.9647,-1.22208 67.93784,-2.65424 88,-2.10144 3.3,0.0909 8.25,0.21845 11,0.28339 2.75,0.0649 9.05,-0.24841 14,-0.69632 13.2197,-1.19621 15.7936,-1.15429 20.2926,0.3305 2.783,0.91848 5.5968,1.094 8.8896,0.55451 2.6498,-0.43413 10.8928,-0.68616 18.3178,-0.56007 7.425,0.1261 18.225,-0.29678 24,-0.93972 5.775,-0.64294 12.6796,-1.10371 15.3436,-1.02392 2.8874,0.0865 5.7854,-0.4721 7.1758,-1.38312 2.0404,-1.33689 2.9112,-1.35396 6.9572,-0.1363 3.5,1.05334 6.2298,1.16458 11.2237,0.45737 3.6293,-0.51398 6.8157,-0.71765 7.0807,-0.45259 1.1988,1.19877 4.0449,-1.70612 4.6069,-4.70205 0.7458,-3.97518 3.8695,-6.95449 6.3447,-6.05138 1.6769,0.61184 1.679,0.54387 0.041,-1.32723 -2.3034,-2.63145 -1.3655,-12.21902 1.3866,-14.17374 1.4259,-1.01281 1.8397,-2.61592 1.8397,-7.12756 0,-6.21043 -0.8753,-7.64936 -5,-8.21992 l -2.5,-0.34582 -2e-4,-15.32111 c -10e-5,-13.17171 0.2392,-15.53773 1.706,-16.86517 0.9384,-0.84923 2.0101,-3.62973 2.3816,-6.17889 0.3715,-2.54915 1.5163,-6.3044 2.544,-8.34499 2.2606,-4.48856 2.3466,-6.45472 0.3686,-8.4327 -0.825,-0.825 -1.5,-2.67635 -1.5,-4.11412 0,-1.43776 -0.8204,-3.54312 -1.8231,-4.67857 -2.1542,-2.43937 -4.463,-9.74768 -3.3246,-10.52361 1.4412,-0.98224 2.0088,-3.7797 0.9765,-4.81208 -0.6866,-0.68661 -0.5307,-1.77744 0.482,-3.37186 0.8234,-1.29629 1.7912,-4.18881 2.1507,-6.42782 0.6509,-4.05265 0.6356,-4.07692 -3.4039,-5.41006 -4.5674,-1.50737 -5.6607,-4.65224 -1.8076,-5.19947 1.948,-0.27665 2.2626,-0.94289 2.3437,-4.96306 0.064,-3.18345 0.7946,-5.53468 2.323,-7.47773 1.6343,-2.0777 2.0398,-3.50745 1.5191,-5.35648 -0.3907,-1.38725 -0.7266,-7.59061 -0.7465,-13.78524 -0.031,-9.54201 0.2278,-11.4559 1.6908,-12.52573 1.3891,-1.01571 1.6676,-2.52138 1.4234,-7.6957 -0.2781,-5.89471 -0.5127,-6.49079 -2.8035,-7.12458 -1.5733,-0.4353 -1.8513,-0.72862 -0.75,-0.79135 0.9625,-0.0548 1.6375,-0.6515 1.5,-1.32594 -0.1375,-0.67444 0.7625,-1.38074 2,-1.56955 1.8877,-0.28801 2.25,-0.96799 2.25,-4.22285 0,-3.31844 -0.5424,-4.28466 -3.75,-6.68045 -2.0625,-1.54049 -3.9,-3.13839 -4.0833,-3.55089 -0.1834,-0.4125 -1.432,-0.75 -2.7748,-0.75 -4.6082,0 -6.405,-9.92285 -2.5467,-14.06423 2.1975,-2.35869 2.8213,-4.00755 3.3748,-8.92032 0.1964,-1.74285 0.8934,-2.48916 2.3349,-2.5 1.1302,-0.009 3.5754,-1.74397 5.4336,-3.8566 2.7301,-3.10371 3.1715,-4.17298 2.2993,-5.5696 -0.5937,-0.95065 -0.8489,-2.93463 -0.567,-4.40885 0.4384,-2.29374 0.171,-2.68261 -1.8542,-2.69571 -3.3963,-0.022 -5.7894,-1.71183 -4.0312,-2.84649 0.7345,-0.474 1.1845,-1.2615 1,-1.75 -0.1845,-0.48851 0.6771,-1.032 1.9146,-1.20775 1.3175,-0.18712 2.25,-1.01844 2.25,-2.00589 0,-1.51382 -2.0275,-2.77969 -7.25,-4.52646 -1.2132,-0.4058 -1.75,-1.63848 -1.75,-4.01889 0,-2.916 0.4522,-3.5912 3,-4.47937 3.2443,-1.13096 3.2977,-1.21056 2.393,-3.56805 -0.3895,-1.01503 -1.8304,-1.58179 -4.0214,-1.58179 -3.6271,0 -3.6809,-0.0714 -6.4118,-8.5 -3.1506,-9.72406 -3.0411,-11.17509 1.1717,-15.5161 2.8588,-2.94573 3.8743,-4.8342 3.8907,-7.23504 0.012,-1.78688 0.9023,-4.37386 1.9778,-5.74886 2.5198,-3.22144 2.5198,-7.06941 0,-10.27287 -2.0776,-2.64127 -2.7639,-9.30078 -1.0195,-9.8938 0.5393,-0.18333 1.4473,-2.79946 2.0178,-5.81363 0.9295,-4.91063 0.8237,-5.76919 -1.0174,-8.25943 -1.8575,-2.51232 -2.0564,-4.22902 -2.0719,-17.88122 -0.019,-16.82655 0.5466,-18.50043 6.4457,-19.0735 2.9529,-0.28686 3.1647,-0.57726 3.4621,-4.74643 0.1743,-2.44248 -0.2092,-5.42373 -0.8521,-6.625 -0.8608,-1.60851 -0.8784,-2.72683 -0.067,-4.24338 0.6062,-1.13259 1.1021,-4.03946 1.1021,-6.4597 0,-3.62871 -0.5261,-4.86923 -3,-7.07346 -1.65,-1.47015 -3,-3.27479 -3,-4.01031 0,-0.73551 -0.9,-2.15178 -2,-3.14727 -1.1,-0.99549 -2.0069,-2.52773 -2.0153,-3.40499 -0.01,-0.87725 -0.467,-2.27001 -1.019,-3.09501 -0.876,-1.3092 -1.177,-1.27366 -2.3664,0.27939 -1.1847,1.54692 -1.44,1.57815 -1.9538,0.23906 -0.7338,-1.91209 0.3162,-7.51845 1.4081,-7.51845 2.606,0 3.8734,-3.4378 3.9751,-10.78235 0.2608,-18.83601 0.1023,-23.10438 -0.9296,-25.03246 -0.6045,-1.12954 -1.0991,-3.88329 -1.0991,-6.11945 0,-3.61025 0.2654,-4.06574 2.3692,-4.06574 1.9608,0 2.4759,-0.64631 2.989,-3.75 1.1338,-6.85962 0.7871,-8.8343 -1.7937,-10.21547 -1.9554,-1.0465 -2.3564,-1.91754 -2.0344,-4.41898 0.2557,-1.98619 -0.4651,-4.77799 -1.9885,-7.7017 -3.7921,-7.27813 -4.0938,-10.92652 -1.3909,-16.81848 l 2.3376,-5.09537 5.7558,0 c 6.3245,0 6.6176,-0.4414 5.154,-7.75969 -0.5496,-2.74794 -1.0416,-3.06801 -5.6569,-3.68025 -3.4935,-0.46343 -5.2841,-0.2996 -5.7971,0.53041 -1.5851,2.56467 -3.9441,0.0559 -3.9441,-4.19441 0,-3.15999 -0.604,-4.72652 -2.5,-6.48364 -2.8236,-2.61679 -2.9694,-3.4723 -1.3537,-7.94046 1.4542,-4.02164 0.4651,-8.07881 -2.1354,-8.75885 -1.4616,-0.38222 -2.0109,-1.36133 -2.0109,-3.58431 0,-2.14928 -0.6688,-3.41535 -2.25,-4.25912 -1.2375,-0.66037 -4.0949,-3.15121 -6.3497,-5.53518 -3.5154,-3.71667 -4.6739,-4.3345 -8.1276,-4.3345 -2.315,0 -4.5441,-0.62212 -5.242,-1.46296 -1.062,-1.27962 -1.5216,-1.26149 -3.6677,0.14471 -2.0977,1.37441 -2.8149,1.41436 -4.9433,0.27527 -1.4292,-0.76486 -2.2666,-1.91351 -1.9661,-2.69665 0.2879,-0.75034 0.1097,-1.10853 -0.396,-0.796 -0.5057,0.31254 -1.2021,0.11091 -1.5475,-0.44806 -0.3455,-0.55897 -2.6,-1.01631 -5.0101,-1.01631 -3.9639,0 -6.5224,-1.31097 -5.1794,-2.65397 0.5682,-0.56818 7.3622,-2.40508 9.5211,-2.57424 0.9383,-0.0735 1.1662,-0.98234 0.758,-3.02339 -0.4693,-2.34642 0,-3.50457 2.4083,-5.91026 2.3225,-2.32252 2.992,-3.88449 2.992,-6.9808 0,-2.19385 -0.4553,-4.839554 -1.0118,-5.879334 -1.1825,-2.2095 -6.7562,-3.96452 -12.6161,-3.97243 -2.2703,-0.003 -5.7528,-0.68452 -7.7388,-1.51434 -3.3399,-1.39549 -14.3159,-1.92129 -29.6333,-1.41959 -2.475,0.0811 -11.25,0.10179 -19.5,0.0461 -8.25,-0.0558 -17.25,-0.068 -20,-0.0273 -2.75,0.0408 -12.65,-0.2163 -22,-0.57123 -9.35,-0.35492 -20.15,-0.75152 -24,-0.88133 -3.85,-0.1298 -11.95,0.11949 -18,0.55397 -17.9586,1.28972 -42.50045,1.56007 -50,0.55079 -10.53774,-1.41815 -75.54799,-1.64869 -84.5,-0.29966 -4.125,0.62162 -13.35,1.00598 -20.5,0.85413 -37.91868,-0.8053 -51.70807,-1.23449 -58.5,-1.82077 -4.125,-0.35607 -13.575,-0.78056 -21,-0.94331 -15.6254,-0.3425 -24.60078,-1.22504 -27.66067,-2.71985 -1.62026,-0.79153 -3.51561,-0.62935 -7.57801,0.64843 -4.53348,1.42596 -8.09666,1.61634 -21.83933,1.16689 -9.0321,-0.29539 -18.25441,-0.83115 -20.49404,-1.19059 -2.52893,-0.40587 -6.99172,-0.004 -11.7766,1.06058 -5.15956,1.14789 -8.93448,1.45545 -11.42795,0.93108 -4.16379,-0.87563 -10.99126,-0.69768 -19.2234,0.50103 -3.025,0.44048 -17.425,0.49876 -32,0.12952 -20.42775,-0.51753 -27.21948,-0.37966 -29.63991,0.60167 -5.76647,2.33795 -18.19834,2.75624 -24.76849,0.83338 -5.03375,-1.47321 -8.43851,-1.63392 -23,-1.08559 -9.40038,0.35398 -19.7916,0.55001 -23.0916,0.43562 -6.65492,-0.23068 -6.80137,-0.2249 -31.5,1.24449 -18.3972,1.0945 -25.69042,1.18138 -64.27689,0.76568 l -23.77688,-0.25615 -2.70856,2.70856 c -2.33356,2.33356 -2.53751,2.98244 -1.47311,4.68681 0.67949,1.088054 1.23544,3.768544 1.23544,5.956654 0,2.76862 0.53215,4.26068 1.75,4.90672 0.9625,0.51059 6.7,1.24768 12.75,1.63798 6.05,0.3903 13.925,1.38688 17.5,2.21462 3.575,0.82773 7.625,1.47159 9,1.43079 3.35781,-0.0996 13.34552,-0.13356 19.5,-0.0662 2.75,0.0301 11.525,-0.0375 19.5,-0.15024 14.43728,-0.20405 33.73045,1.40557 35.26721,2.94233 1.28555,1.28555 -0.95289,5.89825 -3.20993,6.61461 -2.51508,0.79826 -2.68981,3.0605 -0.30728,3.97844 4.20822,1.62134 -2.48236,2.59434 -20.94144,3.04546 -44.35162,1.08391 -42.21241,0.78644 -53.00062,7.37027 -3.40261,2.07654 -7.80794,8.83556 -7.80794,11.97957 0,0.67326 -0.83583,2.89369 -1.8574,4.93428 -2.73481,5.46278 -3.54873,11.01629 -4.72068,32.21016 -0.77078,13.93878 -0.74383,19.45753 0.12561,25.72358 0.49813,3.59001 0.15774,8.2361 -1.08846,14.85661 -1.56701,8.32487 -1.64825,10.61495 -0.5983,16.86358 0.66822,3.9768 0.98037,8.99132 0.69367,11.14338 -1.96424,14.74429 -2.18761,26.29767 -0.93597,48.41285 0.79427,14.03412 0.88713,37.57469 0.25638,65 -0.0316,1.375 0.47528,8.8 1.12645,16.5 1.1821,13.97823 1.29821,16.46576 1.12026,24 -0.052,2.2 -0.0738,7.24215 -0.0485,11.20478 0.0253,3.96264 -0.37968,8.74627 -0.89988,10.6303 -0.5687,2.05967 -0.60684,6.76274 -0.0956,11.79522 0.71267,7.01585 1.04968,25.67055 0.72027,39.8697 -0.21321,9.19018 0.38891,24.6069 1.37118,35.10797 0.78213,8.36135 0.78132,13.39575 -0.003,18 -0.78138,4.58767 -0.78475,8.93258 -0.0119,15.39203 1.08145,9.03888 1.25029,13.73484 0.82697,23 -0.12565,2.75 0.14387,13.55 0.59894,24 0.88081,20.22633 0.95094,24.10516 0.57857,32 -0.4509,9.55978 0.6397,25.15689 2.34295,33.50776 0.96266,4.71981 1.50204,10.6028 1.23086,13.425 -0.28431,2.95886 0.0825,6.62553 0.89243,8.92115 0.75632,2.14365 1.37513,6.53067 1.37513,9.74893 0,5.81446 4.27277,20.9519 7.69518,27.26227 1.96577,3.62455 8.71325,9.76244 12.47223,11.34544 5.36959,2.26127 22.33791,4.26482 26.466,3.125 2.15166,-0.5941 6.78169,-0.75719 10.81454,-0.38093 3.87863,0.36187 12.30181,0.74512 18.71818,0.85166 6.41638,0.10655 12.03853,0.56587 12.49367,1.02072 0.96796,0.96734 9.00026,-0.0749 11.69634,-1.51768 z m 35.06618,-208.22773 c -4.16934,-1.81548 -9.08507,-8.00272 -9.88543,-12.4424 -0.67116,-3.72304 -1.88676,-48.01879 -1.54062,-56.13919 0.34021,-7.98112 0.28972,-10.32804 -0.44101,-20.5 -0.3951,-5.5 -0.64773,-12.025 -0.5614,-14.5 0.37985,-10.88924 0.29546,-16.43467 -0.47174,-31 -0.44904,-8.525 -0.78224,-16.4 -0.74044,-17.5 0.0418,-1.1 0.30984,-12.62048 0.59566,-25.60106 0.59805,-27.161 1.27498,-30.21119 7.47852,-33.69777 5.06617,-2.84735 27.29971,-4.53965 38.67356,-2.94364 5.74991,0.80685 9.20282,0.78484 13.41674,-0.0855 8.17046,-1.68758 14.2436,-1.44822 19.4065,0.76485 7.72401,3.3109 9.6884,8.63102 7.63004,20.66431 -1.22127,7.13962 -1.46481,7.60416 -4.90734,9.36041 -4.02947,2.05568 -9.58843,3.06691 -18.57536,3.37905 -6.31777,0.21943 -13.94734,3.28883 -17.2599,6.94371 -2.39641,2.64406 -3.37276,19.82346 -1.61728,28.45693 1.54278,7.58738 6.28058,14.97423 10.1694,15.8554 18.20644,4.12541 23.21885,8.46946 23.19677,20.10369 -0.0203,10.7033 -0.67554,12.42793 -6.28765,16.54966 -3.25203,2.3884 -6.21256,3.75202 -8.15366,3.75558 -4.75119,0.009 -10.81745,1.97463 -13.39269,4.34027 -3.7599,3.45387 -4.89738,6.59226 -6.04218,16.67077 -1.10885,9.762 -1.1476,11.70443 -0.7079,35.48338 0.26251,14.19664 -1.04609,23.57572 -3.92068,28.10052 -2.27144,3.5754 -7.60265,5.40312 -15.63536,5.36034 -4.04188,-0.0215 -8.73383,-0.6422 -10.42655,-1.37927 z m 383.14497,-0.33879 c -4.78736,-1.13899 -16.69243,-7.35496 -22.40023,-11.69578 -6.96381,-5.29601 -8.63242,-7.46816 -9.54619,-12.4269 -0.34255,-1.85893 -2.13887,-5.05796 -3.99182,-7.10896 -3.07806,-3.40704 -3.42964,-4.45702 -4.07117,-12.15857 -0.79323,-9.52266 -0.24084,-12.75383 3.08744,-18.0595 1.83726,-2.92882 3.41604,-4.0308 7.52152,-5.25 2.85789,-0.8487 6.35199,-1.54123 7.76466,-1.53895 3.71576,0.006 13.31041,6.06989 15.08625,9.53465 0.83477,1.62866 2.63477,4.11456 4,5.5242 1.36524,1.40965 3.25116,4.00122 4.19093,5.75904 2.8117,5.25923 10.37475,6.86668 15.04039,3.19669 5.99844,-4.71837 6.77227,-14.18186 2.03797,-24.92325 -2.89773,-6.57448 -14.67758,-18.57249 -26.36557,-26.85383 -16.87188,-11.95431 -33.40139,-35.31607 -35.935,-50.78825 -0.53619,-3.27436 -0.98127,-10.45339 -0.98908,-15.95339 -0.0127,-8.96167 0.77482,-14.2391 4.1361,-27.71693 1.20293,-4.82344 11.50065,-16.54989 18.80159,-21.41019 11.17266,-7.43771 12.67098,-8.15811 18.56492,-8.92599 7.39909,-0.96397 15.67682,-0.67007 16.94865,0.60176 0.52324,0.52324 2.17131,0.95135 3.66237,0.95135 11.44906,0 27.60743,14.77284 32.01316,29.26813 2.3341,7.67944 2.80829,14.32071 1.55976,21.84513 -0.69784,4.20564 -1.19353,4.84624 -5.61004,7.25 -9.26054,5.04022 -16.52679,3.17506 -25.0672,-6.43443 C 670.70301,359.78809 668,356.29842 668,355.7505 c 0,-1.79904 -6.10032,-6.174 -8.60884,-6.174 -3.80217,0 -9.10077,2.58889 -10.44703,5.1044 -3.86254,7.21723 3.07145,21.65615 16.89692,35.1851 4.89578,4.79077 9.40039,8.7105 10.01025,8.7105 0.60986,0 4.08818,2.7 7.7296,6 3.64142,3.3 7.00215,6 7.46828,6 0.46614,0 4.21718,4.6125 8.33565,10.25 4.11847,5.6375 8.64171,11.66176 10.05165,13.38725 1.71365,2.09717 2.56352,4.35142 2.56352,6.79966 0,2.89803 1.8758,8.44234 3.5039,10.35648 0.13725,0.16136 2.13308,-0.28864 4.43517,-1 l 4.18563,-1.29339 -0.18437,-15.5 c -0.10141,-8.525 0.26687,-20.74479 0.81838,-27.15509 0.65719,-7.63855 0.66619,-13.49705 0.0261,-17 -1.17128,-6.40997 -0.31663,-52.98989 1.11205,-60.60905 1.14153,-6.08781 4.0422,-10.63587 8.13232,-12.75095 4.22755,-2.18615 18.33284,-1.95864 23.47082,0.37857 5.40437,2.4584 6.48431,4.01454 7.5082,10.819 0.48146,3.19964 1.38639,7.39252 2.01096,9.31752 0.62458,1.925 1.10859,8.225 1.07558,14 -0.0696,12.17707 2.01296,29.50774 3.75526,31.24999 0.9332,0.93324 1.6359,0.92767 3.1614,-0.025 2.361,-1.47449 6.9886,-1.62345 6.9886,-0.22496 0,0.55 0.3721,1 0.8268,1 0.4548,0 0.6255,-1.37175 0.3794,-3.04834 -0.2461,-1.67659 0.117,-5.83909 0.8068,-9.25 0.6897,-3.41091 1.3934,-10.92666 1.5636,-16.70166 0.5263,-17.85954 1.9996,-25.52259 6.0923,-31.68844 5.0884,-7.66605 7.2364,-8.54724 17.5089,-7.18281 4.5772,0.60796 9.0402,1.48133 9.9177,1.94082 0.8775,0.45949 3.3267,3.34909 5.4427,6.42133 l 3.8471,5.5859 1.3082,30.2116 c 1.4065,32.48291 1.9934,130.2191 0.8455,140.7878 -0.3838,3.53309 -1.1535,8.2238 -1.7106,10.4238 -1.0745,4.24373 -5.2284,10.5 -6.9716,10.5 -0.5727,0 -2.1855,0.9 -3.5839,2 -1.3985,1.1 -3.6799,2 -5.0699,2 -1.39,0 -4.8979,0.7473 -7.7954,1.66066 -4.9149,1.54929 -5.4392,1.54865 -7.8171,-0.009 -3.0787,-2.0172 -5.062,-5.67857 -7.5481,-13.93415 -2.6531,-8.80983 -3.0284,-12.10213 -3.5443,-31.09075 -0.48,-17.66718 -0.9795,-19.62634 -5.004,-19.62634 -1.6176,0 -2.3969,-0.71139 -2.7389,-2.5 -0.2628,-1.375 -0.09,-2.5 0.3835,-2.5 1.4973,0 0.9303,-4.75954 -0.6387,-5.36163 -0.825,-0.31658 -1.5,-0.0872 -1.5,0.50965 0,0.59688 -0.8464,0.86392 -1.8808,0.59341 -1.704,-0.44562 -1.9475,0.3657 -2.591,8.63337 -0.3907,5.01886 -1.0642,9.5752 -1.4968,10.1252 -0.4326,0.55 -1.0618,6.625 -1.3983,13.5 -0.94487,19.3037 -2.1286,29.1758 -3.95696,33 -1.63229,3.4141 -7.73217,8.03873 -12.50586,9.48134 -3.13153,0.94635 -15.17474,-1.41759 -17.67028,-3.46847 -1.1,-0.904 -3.15518,-2.35815 -4.56706,-3.23144 -1.94125,-1.20072 -2.87417,-3.01316 -3.82683,-7.43462 -0.69287,-3.21574 -2.02408,-7.86289 -2.95824,-10.32698 -1.37615,-3.62995 -2.16811,-4.48393 -4.17317,-4.5 -1.52425,-0.0127 -2.4747,-0.59638 -2.4747,-1.52028 0,-1.60563 -1.36946,-2.96458 -3,-2.97699 -1.42914,-0.0109 -5.5,7.4555 -5.5,10.08756 0,5.06995 -8.87725,15.6253 -16.02667,19.05626 -12.15334,5.83231 -18.94448,7.80195 -28.15858,8.16688 -5.12311,0.2029 -10.18447,0.162 -11.24746,-0.0909 z m -281.21115,-1.83519 c -1.72912,-0.7297 -4.47551,-2.94224 -6.10307,-4.91676 -2.82278,-3.42452 -2.99682,-4.19859 -3.77511,-16.79044 -0.44874,-7.26023 -0.9563,-17.25041 -1.12791,-22.20041 -0.1716,-4.95 -0.6193,-17.55 -0.99489,-28 -0.37558,-10.45 -0.51986,-20.8 -0.32062,-23 0.48285,-5.33168 0.39131,-14.10325 -0.53744,-51.5 -0.43027,-17.325 -0.73848,-32.625 -0.68491,-34 0.0536,-1.375 0.23692,-7.00065 0.40744,-12.50146 0.37105,-11.96994 2.32836,-16.13313 9.1338,-19.42759 5.16404,-2.49987 5.93789,-2.51942 16.12372,-0.40749 5.62519,1.16632 8.88151,2.43645 10.89601,4.25 5.06013,4.55534 5.88069,8.00739 6.43855,27.08654 0.61294,20.96267 0.77515,39.42639 0.44807,51 -0.13212,4.675 -0.0554,13.45 0.17042,19.5 0.45479,12.18296 0.51663,30.08294 0.24874,72 -0.17369,27.17821 -0.24784,28.13991 -2.52635,32.76695 -1.29108,2.62182 -3.09108,5.14896 -4,5.61587 -3.07442,1.5793 -20.39262,1.96123 -23.79645,0.52479 z M 566.5,528.68646 c -9.62911,-4.44412 -11.49752,-10.21274 -11.5338,-35.60996 -0.0279,-19.56457 -0.4734,-35.57273 -1.4887,-53.5 -0.35821,-6.325 -0.60973,-13.525 -0.55892,-16 0.0508,-2.475 0.002,-19.8 -0.10954,-38.5 -0.11105,-18.7 -0.19567,-37.6 -0.18805,-42 0.0187,-10.80665 2.69039,-18.36275 8.14284,-23.02985 3.97124,-3.39922 4.23686,-3.47015 12.99591,-3.47015 11.55813,0 14.65519,1.11557 17.64133,6.35447 3.80792,6.68064 5.34146,28.45376 3.3345,47.34324 -0.82672,7.78113 -0.79472,11.16151 0.13506,14.26483 1.43763,4.79839 2.43068,36.37851 2.01367,64.03746 -0.42429,28.14207 -0.37992,36.27287 0.25921,47.5 0.52198,9.16913 0.32566,10.76737 -2.36277,19.23577 -2.2126,6.96959 -3.58824,9.69248 -5.60639,11.09705 -6.42147,4.46917 -15.86908,5.41797 -22.67435,2.27714 z m -134.17126,-2.56772 c -3.80568,-1.65545 -5.72017,-4.84652 -4.89062,-8.1517 0.3345,-1.33275 -0.0943,-5.13427 -0.95296,-8.44781 -1.1173,-4.3118 -1.37372,-8.09292 -0.90191,-13.2995 0.36258,-4.00118 0.13406,-14.22025 -0.50782,-22.70905 -0.78301,-10.35539 -0.85577,-17.80354 -0.2211,-22.63454 0.73016,-5.55782 0.62703,-8.12601 -0.45208,-11.25815 -1.0788,-3.13125 -1.37104,-10.39228 -1.27986,-31.79964 0.065,-15.25802 -0.13405,-34.26685 -0.4423,-42.24185 -0.30826,-7.975 -0.14896,-17.2 0.35399,-20.5 0.50295,-3.3 1.10535,-8.82176 1.33866,-12.27057 0.69203,-10.22973 5.83661,-15.51948 16.17576,-16.6322 5.19428,-0.55902 18.85729,1.19349 19.82187,2.54248 0.1417,0.19816 1.88082,2.38831 3.86473,4.86699 1.9839,2.47869 4.27911,6.30369 5.10045,8.5 5.54139,14.81797 7.0018,18.21573 8.59344,19.9933 0.98493,1.1 2.25832,3.92166 2.82974,6.27036 1.05258,4.32639 6.90624,13.15477 8.74127,13.18341 2.41051,0.0376 3.79146,-2.11068 5.18909,-8.07246 1.67722,-7.15444 1.62045,-6.21709 1.32537,-21.88131 -0.22897,-12.15433 0.56909,-15.83561 4.30215,-19.84501 3.64595,-3.91585 7.76038,-5.5003 14.32276,-5.51564 6.40068,-0.015 10.06401,1.55309 13.51504,5.78497 3.30977,4.05867 3.26411,2.83612 4.24254,113.57568 0.52514,59.43606 0.39217,71.91242 -0.84732,79.5 -1.99621,12.21994 -2.72132,12.77842 -16.01517,12.33483 L 505.5,527.0765 l -4.06217,-4 c -4.00106,-3.93982 -12.58277,-19.80597 -14.06293,-26 -0.39429,-1.65 -2.14771,-6.15 -3.89648,-10 -1.74878,-3.85 -3.49029,-8.67722 -3.87003,-10.72715 -0.37974,-2.04993 -2.14861,-5.64993 -3.93081,-8 -1.7822,-2.35007 -3.78723,-6.07285 -4.45562,-8.27285 -1.84187,-6.06251 -2.56615,-6.80295 -5.93144,-6.06381 -2.7825,0.61114 -3.06747,1.14032 -4.76945,8.85689 -2.14578,9.7287 -2.2577,14.53489 -0.68011,29.20692 1.91111,17.77389 -0.085,28.16058 -6.32698,32.92154 -2.93717,2.24029 -4.34014,2.57333 -10.69726,2.53932 -4.0242,-0.0215 -8.74379,-0.65991 -10.48798,-1.41862 z M 774,457.5765 c 0,-1.1 0.6269,-2 1.393,-2 1.9997,0 2.7668,2.7247 0.9621,3.41724 C 774.1307,459.84729 774,459.76861 774,457.5765 z m 128.5,-180 c -0.3992,-0.64585 -0.2757,-1.62426 0.2743,-2.17426 0.6666,-0.66667 1.2419,-0.60858 1.7257,0.17426 0.3992,0.64585 0.2757,1.62426 -0.2743,2.17426 -0.6666,0.66667 -1.2419,0.60858 -1.7257,-0.17426 z M 243.75,129.81827 c -1.5125,-0.93775 -2.75,-2.05078 -2.75,-2.47339 0,-0.42261 -0.7875,-0.76149 -1.75,-0.75307 -1.49555,0.0131 -1.5319,0.15626 -0.25,0.98469 1.33333,0.86167 1.33333,0.98423 0,1.10311 -0.825,0.0736 -1.82189,0.0857 -2.21531,0.0269 -0.39342,-0.0588 -1.85592,0.3268 -3.25,0.85683 -2.50818,0.95361 -3.62236,-0.19656 -1.47564,-1.5233 0.58248,-0.36 0.98267,-1.62405 0.88931,-2.80902 -0.47795,-6.06657 -0.20451,-6.46316 4.30164,-6.23881 2.3375,0.11637 4.96793,-0.13315 5.84539,-0.55449 1.9334,-0.92837 5.90461,1.60513 5.90461,3.76694 0,1.69471 2.34018,4.37187 3.82158,4.37187 2.2081,0 1.88302,2.81356 -0.44778,3.87554 -3.35364,1.52803 -5.37687,1.37934 -8.6238,-0.63377 z m -21.77022,-6.27954 c -2.42798,-4.53674 1.33748,-7.64438 5.53952,-4.57178 1.63235,1.19361 1.73323,1.7599 0.71257,4 -1.4332,3.14553 -4.71407,3.44558 -6.25209,0.57178 z m 34.56293,0.10687 c -0.31644,-0.512 -0.0873,-1.23252 0.50915,-1.60115 0.59647,-0.36864 0.84293,-1.29973 0.5477,-2.0691 -0.29524,-0.76937 0.0116,-1.39796 0.68182,-1.39686 0.67024,0.001 1.313,1.35109 1.42836,3 0.20474,2.9264 -1.81943,4.24757 -3.16703,2.06711 z M 966.8522,703.00156 c 0.6453,-1.41621 0.9159,-2.99121 0.6015,-3.5 -0.3145,-0.50878 -3.2122,-0.92506 -6.4394,-0.92506 -4.7788,0 -5.9372,0.32476 -6.2426,1.75 -0.7383,3.44655 1.4287,5.25 6.3083,5.25 3.9708,0 4.7592,-0.35169 5.7722,-2.57494 z m 19.1126,-58.35932 c 1.3671,-2.55447 1.3075,-3.06574 -0.3578,-3.06574 -1.3103,0 -2.607,2.0303 -2.607,4.08179 0,1.62742 1.8982,0.97689 2.9648,-1.01605 z m 4.3626,-18.92163 c -0.665,-2.54295 -1.8704,-2.77743 -2.7322,-0.53149 -0.4666,1.21594 -0.9461,1.34107 -1.949,0.50868 -0.7316,-0.60717 -1.6263,-0.80785 -1.9882,-0.44596 -1.0431,1.04311 -0.7637,6.31144 0.342,6.44966 0.55,0.0688 1.4125,0.18125 1.9167,0.25 0.5041,0.0688 1.29,0.49832 1.7462,0.9546 1.1827,1.18268 3.335,-4.62154 2.6645,-7.18549 z m -0.3599,-10.08342 c 0.6902,-1.28965 0.702,-2.14691 0.035,-2.55902 -0.5515,-0.34084 -1.0027,-1.94315 -1.0027,-3.56069 0,-3.52433 -0.9191,-3.71018 -3.4171,-0.69098 -1.0239,1.2375 -2.5805,3.07814 -3.459,4.09032 -1.4724,1.69632 -1.4465,1.95062 0.3305,3.25 2.7319,1.99763 6.295,1.74645 7.5131,-0.52963 z M 986,598.10788 c 0,-1.78348 -0.4163,-2.30886 -1.5,-1.89301 -2.5357,0.97305 -1.856,3.30184 1.25,4.28268 0.1375,0.0434 0.25,-1.03193 0.25,-2.38967 z m 1.7176,-6.26763 c -0.2299,-1.52006 -0.4241,-0.51375 -0.4316,2.23625 -0.01,2.75 0.1806,3.99369 0.4179,2.76375 0.2374,-1.22994 0.2435,-3.47994 0.014,-5 z M 917.8111,362.71444 c 2.0672,-1.311 1.1743,-10.52778 -1.0611,-10.95227 -1.511,-0.28694 -1.75,0.49696 -1.75,5.74101 0,6.08277 0.3662,6.7617 2.8111,5.21126 z m 57.8416,-46.67519 c 0.668,-1.74086 -2.2669,-5.46275 -4.3077,-5.46275 -0.8705,0 -1.345,1.2348 -1.345,3.5 0,3.07824 0.305,3.5 2.5314,3.5 1.3922,0 2.7968,-0.69176 3.1213,-1.53725 z m 9.1591,-283.734306 c -0.4285,-4.436472 -3.2022,-4.370088 -3.63,0.08688 -0.3896,4.058852 1.6566,7.224736 3.0548,4.726312 0.4878,-0.871607 0.7466,-3.037541 0.5752,-4.813188 z M 996.4472,965.6619 c 0.3109,-0.503 0.082,-1.0758 -0.5092,-1.2727 -1.0209,-0.3403 -0.3205,-4.3297 3.2657,-18.60072 0.6296,-2.50548 2.1622,-5.1524 3.6869,-6.36733 2.3953,-1.90871 3.4299,-2.02516 12.6094,-1.4193 5.5,0.36301 17.2,0.87576 26,1.13945 8.8,0.2637 17.6156,0.96778 19.5901,1.56462 1.9746,0.59684 6.0246,0.82228 9,0.50098 17.4454,-1.88387 27.4809,-2.39516 29.1786,-1.4866 2.2343,1.19576 8.7313,11.1354 8.7313,13.3578 0,0.8788 0.7164,2.9831 1.592,4.6764 0.8757,1.6933 1.3919,4.1257 1.1473,5.4054 -0.297,1.5536 0.088,2.4692 1.158,2.7556 0.8815,0.236 -24.8614,0.4812 -57.2063,0.545 -35.3221,0.07 -58.5833,-0.2493 -58.2438,-0.7986 z"
+         id="path3109"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#010001"
+         d="m -19.74832,962.0359 c 0.28149,-2.4973 1.24001,-5.3452 2.13006,-6.3287 0.89004,-0.9835 1.61826,-2.8531 1.61826,-4.1547 0,-1.3016 1.06535,-3.51619 2.36745,-4.92128 3.52289,-3.80157 5.60313,-11.18348 6.82814,-24.23022 0.97943,-10.43123 0.92085,-11.85091 -0.54966,-13.32143 -0.90526,-0.90526 -1.66973,-2.40128 -1.69881,-3.3245 -0.0291,-0.92321 -0.18819,-5.27857 -0.35357,-9.67857 -0.24955,-6.63935 0.0554,-8.62834 1.79311,-11.69437 1.80227,-3.17999 1.92939,-4.12998 0.91293,-6.82289 -1.56039,-4.13393 -0.71107,-5.98274 2.74838,-5.98274 3.70238,0 4.33499,1.21182 1.96218,3.75873 -1.65024,1.77132 -1.70557,2.14417 -0.39298,2.64786 0.84024,0.32243 2.50762,0.0385 3.70527,-0.63094 C 2.5201,876.6827 5.975,876.07943 9,876.01156 c 7.89287,-0.17709 19.08544,-1.44954 22,-2.50111 2.50233,-0.90284 12.82664,-1.57326 40,-2.59745 7.975,-0.30058 19,-0.94838 24.5,-1.43956 5.5,-0.49117 17.6128,-1.14338 26.91734,-1.44936 9.30453,-0.30598 17.77251,-1.014 18.81772,-1.57338 2.27741,-1.21884 8.14285,-1.22255 24.57387,-0.0156 6.76992,0.4973 13.95911,0.532 15.97598,0.0771 2.01688,-0.45488 16.72786,-0.90773 32.69107,-1.00633 C 230.43919,865.4073 248,865.23369 253.5,865.1201 c 5.5,-0.11359 25.75,-0.51728 45,-0.89709 32.94697,-0.65006 43.07235,-1.06427 53.27273,-2.17931 2.35,-0.25688 5.95,-0.0986 8,0.35185 2.07301,0.45546 20.14879,0.21035 40.72727,-0.55227 20.35,-0.75416 51.4,-1.53986 69,-1.74601 17.6,-0.20615 53.81377,-0.61721 80.47506,-0.91347 27.91991,-0.31025 51.63163,-1.01714 55.91919,-1.66706 4.09428,-0.62063 9.7305,-0.84418 12.52494,-0.4968 2.79445,0.34739 8.68081,0.56412 13.08081,0.48163 30.18789,-0.56596 38.72724,-0.84534 52.5,-1.71765 18.89633,-1.19682 104.1326,-1.50286 109,-0.39136 1.925,0.43958 5.4595,0.44061 7.8543,0.002 5.8246,-1.06603 40.2185,-2.23086 57.6457,-1.95231 15.4505,0.24695 19.0855,0.99937 22.5273,4.66297 1.2767,1.35904 2.8394,2.47098 3.4727,2.47098 2.4426,0 8.5,9.61961 8.5,13.49874 0,0.78699 0.8695,1.89625 1.9323,2.46501 1.0627,0.56877 2.2107,1.91159 2.5511,2.98404 0.6947,2.18866 3.7391,3.48093 7.5885,3.22115 2.621,-0.17688 13.8295,3.94816 17.2635,6.35346 2.858,2.00178 5.7004,7.22073 4.9697,9.12482 -0.4236,1.10384 -0.2582,1.44183 0.4817,0.98457 2.0228,-1.25019 0.2115,9.6668 -1.8862,11.36821 -2.7229,2.20844 -8.893,12.88669 -7.8269,13.54554 0.5035,0.31122 1.3755,1.42532 1.9377,2.47579 0.8605,1.60783 0.522,2.16862 -2.1402,3.54529 -2.2612,1.16931 -2.7941,1.86303 -1.8697,2.43428 0.8451,0.52235 1.1007,1.98199 0.7381,4.21626 -0.4324,2.6646 -0.1344,3.67971 1.3529,4.60855 2.6769,1.67172 2.4283,2.64197 -1.908,7.44663 -4.1663,4.61626 -4.5277,7.22946 -1.7445,12.61156 1.4769,2.856 1.4546,3.1021 -0.3684,4.0778 -1.3332,0.7135 -147.78037,1.0383 -468.13591,1.0383 l -466.19579,0 0.51178,-4.5406 z m 1020.30292,-2.7094 c 0.6183,-6.6342 3.2765,-16.91446 4.7564,-18.39433 1.502,-1.50205 9.8775,-2.11634 17.3588,-1.27315 14.7361,1.66082 44.4625,2.62178 58.3302,1.88561 3.025,-0.16058 7.4692,0.26351 9.876,0.94242 l 4.376,1.23439 -0.6069,4.42753 c -0.4738,3.45693 -0.2931,4.42753 0.8243,4.42753 0.7872,0 1.8756,-0.7875 2.4186,-1.75 1.3671,-2.42295 2.9674,-0.6119 3.3262,3.7642 0.2764,3.3715 0.1711,3.4858 -3.2142,3.4858 -2.869,0 -3.4807,0.3606 -3.3931,2 0.1621,3.0316 0.7859,4.9212 1.8931,5.7347 0.55,0.4041 -20.9647,0.7416 -47.8106,0.75 l -48.8105,0.015 0.6757,-7.25 z M -16.46489,879.98974 c -1.94123,-2.9627 -1.54512,-3.86858 1.29715,-2.96648 2.13074,0.67627 3.52831,3.16082 2.61197,4.64348 -0.9491,1.53567 -2.1384,1.02546 -3.90912,-1.677 z m -7.44538,-17.41936 c -0.84444,-4.4872 -1.52847,-15.91945 -1.70488,-28.49388 -0.16203,-11.55 -0.53022,-21.93974 -0.8182,-23.08831 -0.28798,-1.14857 0.12741,-2.94857 0.92308,-4 2.01667,-2.66492 1.85414,-4.71585 -0.48973,-6.17962 -2.85787,-1.78477 -2.96086,-11.23207 -0.12244,-11.23207 1.03265,0 2.43364,0.67005 3.1133,1.48899 1.61371,1.9444 3.00914,1.011 3.00914,-2.01282 0,-1.37305 -0.84871,-2.86002 -1.97708,-3.4639 -3.89592,-2.08503 -4.33938,-4.61173 -2.10217,-11.97726 1.2201,-4.01693 3.10837,-7.78562 4.59746,-9.17584 4.28722,-4.00255 6.21011,-8.09643 6.92491,-14.7433 0.3776,-3.51127 1.31747,-7.34704 2.0886,-8.52394 0.77113,-1.1769 1.51268,-3.59154 1.64788,-5.36587 0.1352,-1.77433 0.6001,-3.22606 1.03311,-3.22606 0.43301,0 0.78729,-0.75 0.78729,-1.66667 0,-0.91666 -0.29563,-1.37103 -0.65695,-1.00971 -0.36133,0.36133 -1.41268,-1.57539 -2.33634,-4.3038 -1.22419,-3.61616 -1.55545,-7.10156 -1.22216,-12.85899 0.55744,-9.6295 -0.59159,-13.46876 -6.11406,-20.42893 -9.27535,-11.69006 -9.41924,-12.01927 -7.53302,-17.23552 0.9526,-2.63436 0.78584,-4.08543 -1.02602,-8.92805 -1.88686,-5.04309 -2.00409,-6.22324 -0.91683,-9.23 0.8532,-2.35948 0.91729,-3.66704 0.20308,-4.14295 -2.2979,-1.53118 -2.76349,-5.56849 -3.02093,-26.19538 -0.14759,-11.825 -0.2946,-22.175 -0.3267,-23 -0.0321,-0.825 0.33407,-6.09894 0.81369,-11.71986 1.08675,-12.73606 3.97731,-19.28635 11.16731,-25.30615 6.22982,-5.2159 7.76312,-9.53128 6.10146,-17.17216 -0.63414,-2.91601 -1.31267,-11.15183 -1.50784,-18.30183 -0.37174,-13.61828 -2.87427,-24.54559 -6.64148,-29 -0.9303,-1.1 -3.80992,-5.31955 -6.39917,-9.37677 l -4.70771,-7.37677 -0.32265,-13.12323 c -0.17746,-7.21778 -0.65454,-15.46133 -1.06019,-18.319 -0.86578,-6.09926 0.006,-10.71015 1.88907,-9.98767 3.31747,1.27303 4.11924,-1.04203 4.02475,-11.62119 -0.10887,-12.18821 -0.66869,-13.7379 -3.87473,-10.72598 l -2.25642,2.1198 -0.60339,-3.71827 c -0.33187,-2.04505 -0.15635,-5.71307 0.39003,-8.15115 0.54639,-2.43808 0.91722,-8.32242 0.82407,-13.07632 -0.19685,-10.04609 0.93551,-13.54837 5.63214,-17.41973 3.29269,-2.71411 7.52296,-8.39803 10.39997,-13.97372 0.78044,-1.5125 1.91004,-2.75 2.51022,-2.75 0.60018,0 2.28117,-1.10336 3.73552,-2.45192 2.42493,-2.24852 2.56642,-2.79849 1.70564,-6.62954 -1.09537,-4.87514 -2.19651,-7.1801 -5.62068,-11.76549 -2.20558,-2.95354 -2.57854,-4.71669 -3.17298,-15 -0.72813,-12.59603 -1.18583,-13.8146 -7.82912,-20.8443 -1.97966,-2.09481 -5.12288,-7.10159 -6.98492,-11.12618 -2.83441,-6.12624 -3.35248,-8.32388 -3.18247,-13.5 0.11168,-3.40041 -0.29169,-9.60746 -0.89638,-13.79343 -0.6939,-4.80357 -0.76501,-8.86095 -0.19277,-11 0.72544,-2.71177 0.71367,-19.61364 -0.0292,-41.88914 -0.0459,-1.375 0.31126,-6.55 0.79359,-11.5 0.95038,-9.75335 2.59018,-13.27351 9.71676,-20.85899 3.3624,-3.57891 5.25268,-7.65884 7.01502,-15.14101 1.21561,-5.16098 0.55185,-28.51428 -1.10803,-38.98461 -1.73583,-10.94937 -2.29358,-12.42798 -6.52584,-17.30019 C -27.71599,110.98507 -29,108.90267 -29,108.16415 c 0,-0.73852 -0.70789,-1.93026 -1.57309,-2.64831 -3.97396,-3.29809 -5.35553,-8.458294 -6.04908,-22.593454 -1.15468,-23.53328 -0.30122,-41.747272 1.78177,-38.025192 1.73245,3.095717 4.33589,0.416521 4.37306,-4.500303 0.018,-2.376217 1.00376,-6.345395 2.19067,-8.820395 1.8267,-3.809145 2.01782,-5.23143 1.24487,-9.264296 -0.90445,-4.718963 -2.54556,-8.735704 -3.56913,-8.735704 -0.2918,0 -1.35599,0.441759 -2.36485,0.981686 -2.59465,1.388616 -3.00514,-0.3269 -2.3022,-9.621372 0.55641,-7.357072 0.8177,-8.061408 4.25188,-11.461441 2.01248,-1.99246 4.2635,-5.147304 5.00227,-7.010764 0.73877,-1.86346 1.91549,-4.066924 2.61494,-4.896587 0.69944,-0.829663 1.58994,-5.104663 1.97887,-9.5 0.65509,-7.403163 2.44424,-12.399093 4.18928,-11.697889 1.46133,0.587205 8.12992,-3.89279 7.65126,-5.14016 -0.2681,-0.698654 0.36789,-2.256498 1.41331,-3.461876 l 1.90076,-2.191597 458.5243,0 458.52431,0 0.6835,2.75 c 0.949,3.817836 5.7028,11.158445 7.6251,11.774359 0.8755,0.280509 2.6736,1.661421 3.9956,3.068694 3.3316,3.546265 4.5123,15.854366 1.8138,18.906947 -3.1491,3.562308 -3.6715,6.707808 -2.9894,18 l 0.6644,11 -4.3511,4.010425 c -3.4569,3.186195 -4.4695,4.892593 -4.9269,8.302749 -0.501,3.735536 -0.9468,4.366554 -3.4369,4.864575 -2.8514,0.570262 -3.4066,1.737774 -2.2543,4.740464 0.7713,2.009936 3.393,2.073132 3.393,0.08179 0,-1 1,-1.5 3,-1.5 2.883,0 3,0.173224 3,4.440983 0,2.442541 0.45,4.719098 1,5.059017 0.55,0.339919 1,3.264919 1,6.5 0,3.23508 0.4719,6.17359 1.0486,6.53001 1.5232,0.9414 -0.5591,3.13032 -3.7365,3.92779 l -2.6058,0.65402 0.5773,10.94409 0.5774,10.94409 -3.1805,0.008 c -5.1221,0.0123 -15.3165,3.55168 -19.8656,6.89707 -2.72,2.00032 -5.3887,3.09529 -7.544,3.09529 -1.8343,0 -4.9844,0.6891 -7.0002,1.53134 -2.0157,0.84224 -4.2368,1.31189 -4.9358,1.04368 -0.699,-0.26822 -1.527,-0.0733 -1.84,0.43325 -0.313,0.5065 -2.3669,-0.0161 -4.5642,-1.16141 -2.4074,-1.25481 -6.6647,-2.26983 -10.7129,-2.55414 -3.6948,-0.25949 -8.5178,-1.08577 -10.7178,-1.83616 -3.8881,-1.3262 -6.0031,-1.52496 -17.5,-1.64464 -5.6038,-0.0583 -65.42499,-0.005 -72.25,0.0642 -2.0625,0.021 -4.5375,0.0454 -5.5,0.0543 -0.9625,0.009 -10.525,-0.14749 -21.25,-0.34748 -14.02202,-0.26147 -20.80996,0.005 -24.16305,0.947 -2.56468,0.72083 -4.96559,1.00898 -5.33535,0.64033 -0.36977,-0.36865 -8.39639,-0.72971 -17.83695,-0.80236 -9.44056,-0.0726 -29.53965,-0.48066 -44.66465,-0.90672 -31.01283,-0.8736 -38.10426,-0.89224 -49.5,-0.13008 -4.4,0.29428 -14.45903,0.76169 -22.3534,1.0387 -7.89437,0.277 -14.55447,0.70472 -14.80024,0.95048 -0.24576,0.24577 -2.53893,-0.0868 -5.09593,-0.73915 -3.19949,-0.81619 -6.69162,-0.90999 -11.19976,-0.3008 -3.60287,0.48685 -10.37567,0.63596 -15.05067,0.33134 -17.9709,-1.17094 -31.58464,-2.42005 -33.62049,-3.08482 -1.16627,-0.38082 -3.71359,-0.25252 -5.66071,0.2851 -4.13982,1.14306 -24.95728,-0.79886 -28.41788,-2.65092 -1.19319,-0.638933 -4.65649,-1.161403 -7.69622,-1.161403 -4.23042,0 -5.96181,0.46694 -7.38141,1.9907 -2.05274,2.20336 -5.14867,2.20425 -29.63109,0.008 -11.01662,-0.98806 -12.41457,-0.91114 -18.67925,1.02775 -5.88068,1.82005 -7.30758,1.93511 -10.84697,0.87468 -3.25198,-0.97431 -6.04473,-0.95052 -13.82075,0.11776 -5.35987,0.73634 -11.32023,1.26178 -13.24523,1.16764 -1.925,-0.0941 -11.825,-0.36761 -22,-0.60771 -10.175,-0.24011 -21.13049,-0.72088 -24.34554,-1.0684 -4.48244,-0.4845 -6.11475,-0.29398 -7,0.81703 -0.65617,0.8235 -3.85211,1.73428 -7.40446,2.11012 -6.20536,0.65653 -6.25,0.64304 -6.25,-1.8884 0,-2.24674 -0.41516,-2.54917 -3.5,-2.54917 -3.83993,0 -4.69316,1.48653 -1.44495,2.51747 1.13027,0.35874 1.87057,1.17656 1.64511,1.81739 -0.47752,1.35719 -5.59843,0.99446 -7.4309,-0.52636 -2.7382,-2.2725 -82.6486,-0.26601 -95.02041,2.38589 -3.74387,0.80251 -5.92174,0.82005 -7.58739,0.0611 -1.66134,-0.75696 -3.52686,-0.74667 -6.45768,0.0356 -3.35485,0.89546 -5.13621,0.78019 -9.57729,-0.61974 -4.03268,-1.27119 -6.46759,-1.49248 -9.33441,-0.84835 -2.1332,0.4793 -6.33409,0.53474 -9.33532,0.1232 -3.10749,-0.42611 -7.27151,-0.31301 -9.67197,0.26271 -2.61473,0.62711 -5.27256,0.66631 -7,0.10326 -4.39061,-1.43111 -14.21774,0.70117 -16.06692,3.48618 -1.26377,1.90335 -1.30154,2.67676 -0.22859,4.681584 0.80722,1.5083 1.04845,3.88263 0.64855,6.38343 -0.61164,3.82499 -0.5087,4.02098 2.61272,4.97483 1.7872,0.54613 8.7747,1.2838 15.52779,1.63927 11.75107,0.61854 16.02951,1.38784 20.96312,3.76934 1.63207,0.78782 2.93624,0.76541 4.79705,-0.0824 3.12687,-1.4247 9.42352,-1.50954 12.93549,-0.1743 1.76561,0.67129 4.76518,0.61995 9.3151,-0.15944 3.69099,-0.63225 8.3984,-0.83241 10.4609,-0.4448 3.29904,0.62 3.75,1.05006 3.75,3.57611 0,1.57924 0.5625,3.06067 1.25,3.29207 1.84235,0.62008 -0.97184,3.74595 -3.37244,3.74595 -2.48854,0 -2.40539,1.6977 0.12244,2.5 5.56555,1.76644 -0.79316,2.9239 -22.08117,4.01938 -7.99079,0.41121 -15.65606,2.49369 -16.99232,4.61644 -0.31543,0.50107 -1.61382,1.11138 -2.88531,1.35625 -1.2715,0.24486 -2.37677,0.57182 -2.45616,0.72657 -1.96018,3.82073 -3.58504,8.29863 -3.58504,9.87991 0,1.11688 -0.83635,4.13911 -1.85856,6.71607 -4.6124,11.62779 -5.10079,16.2921 -5.67363,54.18538 -0.1455,9.625 -0.57919,21.13009 -0.96375,25.56687 -0.41221,4.75579 -0.27939,9.58727 0.32358,11.77107 1.15683,4.18969 -0.24248,29.00438 -1.93775,34.36309 -0.69849,2.20792 -0.68122,3.82036 0.0557,5.19727 1.21907,2.27785 2.3724,25.36728 2.22788,44.6017 -0.0537,7.15 -0.0803,16.4875 -0.059,20.75 0.0272,5.45307 -0.32291,7.75 -1.18137,7.75 -1.47205,0 -0.46663,17.13459 1.18669,20.22384 0.59744,1.11633 0.76113,4.4912 0.39265,8.09531 -0.43124,4.21793 -0.16699,7.69159 0.83206,10.93787 1.1325,3.67993 1.21863,5.55645 0.38036,8.28776 -0.80433,2.62077 -0.76461,4.77542 0.15411,8.36009 1.07994,4.21371 0.97724,5.87596 -0.80563,13.03938 -1.80202,7.24034 -1.90484,8.99817 -0.87057,14.88289 1.30186,7.40715 2.06197,29.82647 1.0908,32.17286 -1.04558,2.52617 -1.1273,7.19353 -0.24513,14 0.46335,3.575 1.09095,13.025 1.39467,21 0.30372,7.975 0.82713,16.12578 1.16314,18.11285 0.3445,2.03732 0.11099,4.54695 -0.53546,5.75486 -0.6305,1.17811 -1.08982,4.72733 -1.0207,7.88715 0.0691,3.15983 0.1119,7.09514 0.0951,8.74514 -0.0168,1.65 0.64613,5.83851 1.47328,9.3078 1.35964,5.70273 1.34855,6.77552 -0.11566,11.18383 -1.47477,4.44012 -1.48072,5.34355 -0.0666,10.10546 1.19707,4.03097 1.31621,6.10872 0.51985,9.06617 -0.66122,2.45556 -0.70195,5.18669 -0.11316,7.58674 0.50598,2.0625 0.72585,10.725 0.48861,19.25 -0.23725,8.525 -0.39998,16.175 -0.36161,17 0.67587,14.53549 1.49594,21.95961 3.19614,28.93475 1.58965,6.52157 1.90218,9.99572 1.37786,15.31666 -0.49189,4.99201 -0.32437,7.30816 0.61003,8.43405 0.70849,0.85367 1.58579,5.66117 1.94956,10.68333 0.36544,5.04513 1.60489,11.81612 2.76982,15.13121 1.15963,3.3 2.32233,7.14275 2.58377,8.53944 0.26144,1.39669 1.43487,3.42169 2.60762,4.5 1.17276,1.07831 3.64589,3.437 5.49586,5.24153 4.28303,4.17785 8.79262,5.74128 20.98795,7.27631 7.74631,0.97503 10.79648,0.97611 14.58491,0.005 2.63461,-0.67523 5.24556,-0.94628 5.80209,-0.60232 0.55653,0.34396 10.22833,1.07823 21.49289,1.63173 17.07574,0.83903 20.94578,0.77272 23.27632,-0.39881 1.97545,-0.99303 3.67519,-1.14334 5.7953,-0.51248 1.65,0.49098 5.925,0.55702 9.5,0.14677 3.575,-0.41025 17.525,-0.88334 31,-1.05132 33.27042,-0.41473 38.7135,-0.43846 59.5,-0.25941 9.9,0.0853 22.39841,-0.11788 27.77424,-0.45145 l 9.77424,-0.60649 -0.62063,2.47278 c -0.61001,2.43047 -0.5035,2.47787 6.22576,2.77066 5.28662,0.23002 6.84639,0.63963 6.84639,1.79789 0,1.12821 -1.61111,1.62393 -6.5,2 l -6.5,0.5 0.13328,3.11974 c 0.13138,3.07513 0.0527,3.12811 -5.5,3.70488 -3.0983,0.32182 -7.40571,0.18368 -9.57201,-0.307 -2.1663,-0.49067 -5.20268,-0.63934 -6.74752,-0.33037 -1.58405,0.31681 -3.45827,0.0227 -4.29828,-0.67441 -0.9083,-0.75382 -2.55483,-0.96879 -4.21972,-0.55093 -1.50163,0.37688 -4.15237,0.86732 -5.89054,1.08986 -1.73817,0.22254 -4.22791,0.79878 -5.53276,1.28053 -2.977,1.0991 -27.43749,1.93574 -35.87245,1.22696 -4.15899,-0.34947 -41.89293,0.627 -61,1.57855 -7.425,0.36977 -23.9081,0.56284 -36.6291,0.42905 -20.32078,-0.21372 -23.53731,-0.0322 -26.49099,1.49524 -2.90766,1.50361 -4.11416,1.58312 -8.92965,0.5885 -4.20133,-0.86777 -7.51669,-0.86634 -13.50901,0.006 -4.36769,0.6357 -11.09125,1.3012 -14.94125,1.47888 -29.00226,1.33849 -34.5638,2.7146 -37.10528,9.18112 -2.42287,6.16472 -4.18793,8.68358 -6.08492,8.68358 -1.11548,0 -1.93239,0.8632 -2.12935,2.25 -0.17575,1.2375 0.0895,2.25 0.58948,2.25 0.49997,0 1.40292,1.08395 2.00655,2.40878 0.97395,2.13759 1.97712,2.49114 8.91052,3.14042 4.29715,0.4024 10.063,1.50425 12.813,2.44856 4.54334,1.5601 10.52559,1.694 65.5,1.46606 35.67483,-0.14792 66.24306,-0.73632 74.4961,-1.43397 7.69785,-0.65072 15.83972,-0.90666 18.09305,-0.56875 6.82997,1.02422 36.00761,0.81202 51.41085,-0.37389 14.26977,-1.09865 48.96587,-2.32624 72.5,-2.56514 6.6,-0.067 23.7,-0.63976 38,-1.2728 24.87562,-1.1012 91.79553,-2.8252 101.75,-2.62129 2.6125,0.0535 8.6875,0.18014 13.5,0.28141 4.8125,0.10126 12.54203,-0.48934 17.17673,-1.31244 4.63469,-0.8231 8.83469,-1.2444 9.33331,-0.93624 1.77008,1.09397 32.4542,1.00968 46.23996,-0.12703 7.7,-0.6349 19.625,-1.05535 26.5,-0.93432 6.875,0.12102 16.55,-0.20759 21.5,-0.73024 4.95,-0.52266 13.725,-1.16211 19.5,-1.42101 5.775,-0.2589 12.075,-0.70464 14,-0.99054 1.925,-0.2859 5.75,-0.0415 8.5,0.54314 7.49945,1.59433 46.61962,2.23014 55.5,0.90203 6.567,-0.98213 16.6331,-1.07962 58.5,-0.56657 4.95,0.0607 16.2185,-0.28015 25.0411,-0.75736 l 16.0411,-0.86766 4.2316,2.67131 c 3.5323,2.22987 11.1876,9.37863 15.364,14.34747 0.7438,0.88491 0.3028,2.09861 -1.572,4.32672 -1.4804,1.75937 -2.6058,4.3338 -2.6058,5.96106 0,1.57534 -0.4573,3.14691 -1.0163,3.49237 -0.559,0.34546 -0.7432,1.07009 -0.4093,1.61029 0.3338,0.54019 -0.5413,2.04641 -1.9448,3.34714 -2.8727,2.66229 -12.7284,4.2461 -19.3479,3.10919 -9.8499,-1.69172 -21.9195,-2.33454 -33.7817,-1.79919 -7.15,0.32269 -15.475,0.40781 -18.5,0.18916 -3.025,-0.21865 -9.1,-0.349 -13.5,-0.28967 -4.4,0.0593 -12.5,0.10734 -18,0.10668 -5.5,-6.6e-4 -15.4,0.069 -22,0.15484 -6.6,0.0858 -27.975,0.14002 -47.5,0.12045 -26.246,-0.0263 -38.2371,0.35274 -46,1.45412 -9.66384,1.37109 -64.76245,3.02235 -80.5,2.41252 -10.2812,-0.39839 -22.17487,-0.29128 -46,0.41428 -58.23234,1.72448 -66.98892,1.90407 -82.05057,1.68283 -11.89027,-0.17465 -18.19087,0.20078 -24.30788,1.44841 -5.50803,1.12343 -9.15364,1.39262 -10.94942,0.8085 -3.66778,-1.19302 -29.64515,-0.77113 -52.6969,0.85584 -19.42039,1.37067 -23.1476,1.45342 -34.49523,0.76586 -3.575,-0.21661 -14.375,0.25064 -24,1.03833 -9.625,0.78769 -25.6,1.52694 -35.5,1.64277 -18.41783,0.21549 -41.70036,1.7263 -44.64519,2.89705 -0.90485,0.35973 -3.4925,0.15662 -5.75034,-0.45135 -3.22058,-0.86721 -5.15345,-0.7941 -8.97007,0.33932 -3.50309,1.0403 -10.85105,1.48181 -26.24965,1.57724 -11.76161,0.0729 -27.90975,0.70985 -35.88475,1.41547 -8.27464,0.73213 -16.00267,0.93763 -18,0.47865 -1.9256,-0.4425 -6.88542,-0.35458 -11.02603,0.19546 -4.13932,0.54986 -9.08932,0.94301 -11,0.87366 -1.91069,-0.0693 -6.62397,0.45572 -10.47397,1.16682 -3.85,0.71111 -9.025,1.28582 -11.5,1.27714 -13.75719,-0.0483 -48.7196,1.93419 -56.25044,3.1895 -4.81277,0.80224 -11.03264,1.45861 -13.82195,1.45861 -6.69601,0 -13.2505,3.75239 -16.01297,9.16728 -1.10276,2.16159 -2.65969,4.18138 -3.45984,4.48843 C -0.52551,855.6084 -1,857.28559 -1,860.37462 c 0,4.08405 -0.14666,4.38357 -1.34441,2.74555 -1.07729,-1.47328 -1.92172,-1.66363 -4.25,-0.958 -1.59807,0.48432 -5.60559,0.88817 -8.90559,0.89745 l -6,0.0169 -0.5,3.49388 c -0.43955,3.07146 -0.67051,2.58784 -1.91027,-4 z M 542,815.5765 c 0,-0.55 -0.9,-1 -2,-1 -1.1,0 -2,0.45 -2,1 0,0.55 0.9,1 2,1 1.1,0 2,-0.45 2,-1 z m -351.5,-63.5 c 0,-1.56933 -0.75366,-2.0562 -3.5,-2.26099 -4.25418,-0.31723 -6.51727,0.97062 -5.65487,3.21801 0.48369,1.26046 1.65949,1.58491 4.89572,1.35092 3.48984,-0.25232 4.25915,-0.66919 4.25915,-2.30794 z m 86,-1.5 c -0.33992,-0.55 -1.23992,-1 -2,-1 -0.76008,0 -1.66008,0.45 -2,1 -0.35191,0.5694 0.50929,1 2,1 1.49071,0 2.35191,-0.4306 2,-1 z m 69.28344,-3.43085 c 1.10042,-3.37034 1.06426,-4.15002 -0.2536,-5.46788 -1.25815,-1.25815 -2.08803,-1.32905 -4.5738,-0.39078 -1.67022,0.63044 -4.8186,0.96899 -6.9964,0.75233 -3.42245,-0.34048 -3.95964,-0.123 -3.95964,1.60302 0,1.09831 0.7875,2.25098 1.75,2.56148 0.9625,0.3105 2.425,0.77892 3.25,1.04093 1.12275,0.35657 0.87504,0.81304 -0.98492,1.81497 l -2.48492,1.3386 2.98492,0.46179 c 1.64171,0.25398 4.55992,0.40657 6.48492,0.33909 3.15057,-0.11045 3.62813,-0.51514 4.78344,-4.05355 z m -155.22413,-0.66511 c 1.05158,-1.70149 -1.69633,-3.71691 -5.55931,-4.07741 -2.56129,-0.23903 -3.5,0.0678 -3.5,1.14384 0,2.8129 7.61074,5.2774 9.05931,2.93357 z m 169.16879,-2.57535 c 0.24542,-0.74451 -0.36347,-0.9753 -1.671,-0.63337 -1.16915,0.30574 -2.0571,0.0559 -2.0571,-0.57869 0,-0.66265 -1.72788,-1.0761 -4.25,-1.01695 -3.61042,0.0847 -3.87378,0.22017 -1.75,0.90032 2.39841,0.7681 2.40857,0.80469 0.25,0.90032 -1.2375,0.0548 -2.25,0.57214 -2.25,1.14958 0,1.46476 11.23527,0.77384 11.7281,-0.72121 z m 727.7236,116.50765 c -4.0801,-1.30823 -7.2096,-1.7024 -9.9517,-1.25343 -2.2,0.36021 -15.475,0.74859 -29.5,0.86306 -14.025,0.11447 -28.6515,0.56526 -32.5034,1.00176 l -7.0034,0.79363 -3.0502,-4.87068 c -9.5055,-15.17846 -10.628,-22.0397 -10.6951,-65.37068 -0.044,-28.40475 0.037,-29.69227 2.1956,-34.6787 3.6609,-8.45843 4.4809,-8.86104 15.3237,-7.52391 14.008,1.72745 28.5502,2.36671 58.315,2.56344 l 27.0822,0.179 3.4178,2.85102 c 5.3406,4.45492 6.3855,7.1206 6.4026,16.33264 0.015,7.99372 0.106,8.30649 3.2652,11.19363 2.0642,1.88646 3.25,3.9143 3.25,5.55789 0,2.62225 0.3507,2.88746 5.2318,3.95595 2.5239,0.5525 6.9526,6.41376 5.0439,6.67534 -0.4266,0.0585 -1.4507,0.20649 -2.2757,0.32895 -0.825,0.12246 -2.7375,0.29962 -4.25,0.3937 -2.6843,0.16696 -2.7508,0.32038 -2.7854,6.42105 -0.02,3.52066 -0.6596,7.34173 -1.4646,8.75 -0.786,1.375 -1.4451,4.32422 -1.4646,6.55383 -0.029,3.30041 -0.69,4.68828 -3.5574,7.46749 l -3.522,3.41365 0.6637,7.32378 c 0.6317,6.97135 0.5004,7.64663 -2.728,14.03252 -1.8654,3.6898 -3.4431,6.83511 -3.5059,6.98959 -0.063,0.15447 -1.4345,0.65952 -3.0483,1.12235 -2.0769,0.59563 -4.673,0.28393 -8.8858,-1.06687 z M 897.5,795.5765 c -0.3606,-0.58342 0.6563,-1 2.441,-1 1.6824,0 3.059,0.45 3.059,1 0,0.55 -1.0984,1 -2.441,1 -1.3425,0 -2.7191,-0.45 -3.059,-1 z M 407.44113,751.1059 c 2.35051,-1.85195 3.87406,-1.9804 3.31388,-0.2794 -0.22642,0.6875 -1.50142,1.37573 -2.83334,1.5294 -2.34514,0.27057 -2.36032,0.23106 -0.48054,-1.25 z m 13.30887,0.30832 c -4.50419,-1.64507 -3.02334,-6.83772 1.95,-6.83772 2.69971,0 3.08219,-1.81695 0.55,-2.61274 -0.9625,-0.30248 -2.87436,-1.00468 -4.24857,-1.56043 l -2.49857,-1.01046 2.62767,-1.37678 c 3.83104,-2.00728 16.29306,-2.594 18.56168,-0.87389 1.63927,1.24292 1.47271,1.37366 -1.78667,1.4025 -2.35824,0.0209 -4.59375,0.89119 -6.5,2.53058 -1.59805,1.37433 -2.31648,2.49933 -1.59652,2.5 0.71996,6.7e-4 1.06972,0.38841 0.77725,0.86163 -0.29247,0.47323 1.26741,1.67173 3.4664,2.66334 l 3.99817,1.80292 -2.77542,1.83008 c -3.01538,1.9883 -8.17755,2.26895 -12.52542,0.68097 z m 46.47721,-1.55626 c -6.0599,-0.56543 -4.20674,-2.28146 2.46377,-2.28146 5.33053,0 12.30902,-2.81216 12.30902,-4.96024 0,-1.14886 -6.18273,-3.55182 -8.25,-3.20643 -2.96573,0.49551 -1.94111,-0.72607 2,-2.38446 3.18898,-1.3419 9.39045,-1.58067 41.45209,-1.59601 36.61016,-0.0175 41.79791,0.25733 41.79791,2.21453 0,1.31396 -4.66075,1.16142 -6.8811,-0.22521 -1.09439,-0.68346 -2.62522,-0.82846 -3.73643,-0.35393 -1.69494,0.72381 -1.6092,0.90795 0.86064,1.84844 1.50871,0.5745 3.00154,1.85877 3.31739,2.85393 0.31585,0.99516 1.47353,1.80938 2.57263,1.80938 1.09909,0 2.84593,0.45361 3.88186,1.00802 1.37607,0.73645 2.84012,0.55185 5.43426,-0.68521 3.94513,-1.8813 4.24103,-2.50504 2.05075,-4.32281 -0.825,-0.68469 -1.5,-1.59164 -1.5,-2.01546 0,-2.67331 16.2964,-4.15387 45.5,-4.13377 32.33191,0.0223 29.94064,-0.0942 28.73955,1.39923 -1.17549,1.46156 -0.44089,7.75 0.90533,7.75 1.08206,0 1.73213,-1.55278 2.09324,-5 0.14403,-1.375 0.71188,-2.84228 1.26188,-3.26061 1.15887,-0.88146 8.16062,0.0518 10.80209,1.4398 1.21495,0.63841 3.33275,0.46573 6.5,-0.52999 6.36567,-2.00125 24.60331,-3.71667 36.19791,-3.40476 5.225,0.14056 15.35,0.20037 22.5,0.13291 7.15,-0.0675 16.825,-0.0679 21.5,-10e-4 5.02555,0.0719 9.76553,-0.41243 11.59604,-1.1849 2.60045,-1.09738 4.17108,-1.0572 9.81205,0.25103 3.69381,0.85665 8.26311,1.55755 10.15401,1.55755 1.8908,0 3.4379,0.45 3.4379,1 0,0.55 1.125,1 2.5,1 2.1856,0 2.5,0.43568 2.5,3.46482 0,6.08392 -2.5903,6.5619 -39,7.19643 -18.46726,0.32185 -26.54387,0.10672 -29.28497,-0.78002 -3.21481,-1.03999 -4.64586,-0.949 -9.5,0.60401 -5.11537,1.63659 -10.3318,1.8581 -49.71503,2.11108 -28.06117,0.18025 -47.62246,0.74429 -54,1.55705 -10.49473,1.33746 -34.91093,1.22615 -37.5289,-0.17109 -0.84089,-0.44879 -5.79089,-0.38613 -11,0.13925 -9.62287,0.97055 -75.93058,1.88897 -83.74389,1.15993 z m 238.74178,-9.91712 c 0.92208,-0.92208 -2.51524,-2.33393 -5.71899,-2.34903 -3.56237,-0.0168 -4.23557,1.29765 -1.5,2.92877 1.58794,0.94683 6.05083,0.58843 7.21899,-0.57974 z m 84.23031,5.69964 c -4.2055,-1.06023 -4.7728,-1.66802 -3.2592,-3.49183 1.5878,-1.91319 0.5593,-5.02811 -2.6396,-7.99428 l -2.5448,-2.35974 5.1714,-1.10907 c 6.8451,-1.46801 10.1349,-1.39886 15.288,0.32135 7.8487,2.62007 11.3661,2.89009 14.1224,1.08411 3.2347,-2.11945 7.2754,-1.68678 6.8687,0.73548 -0.1616,0.9625 0.1759,1.75 0.75,1.75 0.5741,0 1.0438,-0.675 1.0438,-1.5 0,-1.26017 2.1853,-1.5 13.6681,-1.5 7.5174,0 16.5547,-0.50269 20.0829,-1.11709 7.6122,-1.32561 9.4171,-0.43405 7.2644,3.58834 -1.0428,1.94838 -1.0879,3.07425 -0.2012,5.02021 0.6286,1.3797 1.6026,2.50854 2.1644,2.50854 0.5618,0 1.0214,0.72609 1.0214,1.61354 0,1.35823 -0.7516,1.50085 -4.75,0.90131 -2.6125,-0.39173 -5.5783,-1.15551 -6.5907,-1.69729 -1.2282,-0.65726 -2.7257,-0.62905 -4.5,0.0848 -2.8825,1.15961 -21.9927,0.93669 -23.9606,-0.2795 -0.6593,-0.40747 -1.1987,-1.31955 -1.1987,-2.02685 0,-2.17203 -3.3735,-4.60123 -4.9966,-3.59805 -1.2121,0.74913 -1.0725,1.29957 0.848,3.34391 3.1614,3.3652 1.8687,3.93444 -10.848,4.77682 -5.7769,0.38267 -12.5284,0.93915 -15.0034,1.23662 -2.475,0.29747 -5.9853,0.16639 -7.8007,-0.29129 z M 805.5,740.5765 c -0.3399,-0.55 -1.2665,-1 -2.059,-1 -0.7926,0 -1.441,0.45 -1.441,1 0,0.55 0.9266,1 2.059,1 1.1325,0 1.7809,-0.45 1.441,-1 z m 35.5,-1.5 c 0,-0.825 -0.4234,-1.5 -0.941,-1.5 -1.261,0 -2.1641,1.56159 -1.3651,2.36052 C 839.82,741.0632 841,740.62291 841,739.0765 z m -378.6168,5.73469 c -1.35532,-0.89159 -1.27305,-5.44828 0.1168,-6.46938 1.505,-1.1057 8.5,-0.91257 8.5,0.23469 0,0.55 -0.87344,1 -1.94098,1 -1.06754,0 -2.2502,0.50031 -2.62812,1.1118 -0.81085,1.312 1.54159,3.06013 3.26817,2.42862 0.71384,-0.26109 0.97405,0.14784 0.64301,1.01051 -0.58354,1.5207 -5.98168,1.98446 -7.95888,0.68376 z M 394,739.0765 l -2.5,-1.42913 2.66821,-0.0354 c 3.46519,-0.046 5.96693,0.93688 5.26703,2.06934 -0.77572,1.25515 -2.52144,1.0609 -5.43524,-0.60478 z m 696.6306,-64.20275 c -0.8921,-0.89206 -61.6513,-1.61521 -82.1306,-0.97751 -2.9877,0.093 -4.668,-0.50108 -6.6397,-2.34759 -1.4518,-1.35968 -3.592,-3.14715 -4.7559,-3.97215 -3.3197,-2.35298 -5.778,-13.84435 -4.2444,-19.84016 0.8487,-3.31777 1.0498,-13.01209 0.6986,-33.65984 -0.312,-18.33617 -0.099,-31.39017 0.5791,-35.5 1.1155,-6.761 4.7265,-14.35016 7.2972,-15.33663 0.8183,-0.31402 5.6462,-0.10668 10.7287,0.46076 5.0824,0.56745 10.3873,0.74908 11.7886,0.40363 1.4013,-0.34545 8.3978,-0.99004 15.5478,-1.43242 9.9,-0.61252 14.091,-0.48446 17.5753,0.53703 5.7301,1.6799 8.605,1.78521 22.9746,0.84159 8.4516,-0.555 12.1624,-0.43072 13.8328,0.46328 2.0745,1.11023 9.2412,14.77433 13.1452,25.06276 0.7305,1.925 1.923,4.38763 2.6501,5.47251 0.7271,1.08487 1.322,3.66856 1.322,5.74152 0,2.68602 0.5747,4.12792 2,5.01804 2.7706,1.73025 2.8628,11.1822 0.1385,14.20348 -3.0219,3.35146 -4.0351,7.73591 -3.0303,13.11403 0.497,2.66064 0.6453,5.65181 0.3294,6.64704 -0.318,1.00203 0.1255,2.50939 0.994,3.37788 2.1151,2.11508 1.9735,4.64076 -0.4316,7.69837 -1.1,1.39842 -2,3.28098 -2,4.18346 0,0.90247 -1.6875,4.21068 -3.75,7.35156 -2.0625,3.14088 -4.3885,6.94402 -5.169,8.4514 -0.7804,1.50739 -2.2164,2.74071 -3.191,2.74071 -0.9746,0 -2.0501,0.45 -2.39,1 -0.715,1.1569 -2.8461,1.32061 -3.8694,0.29725 z M 272,529.66053 c 0,-1.05378 -1.8,-3.3416 -4,-5.08403 -2.98057,-2.36066 -4,-3.89037 -4,-6.00224 0,-3.64808 -0.96451,-6.13773 -2.10478,-5.433 -1.28598,0.79478 -1.10772,-3.95226 0.19742,-5.2574 0.74899,-0.74899 0.77697,-1.68248 0.089,-2.96804 -1.93855,-3.62221 -3.68228,-40.93661 -2.00998,-43.01199 0.59675,-0.74059 0.51749,-4.2409 -0.21514,-9.5 -1.38585,-9.94832 -2.53894,-62.89219 -2.20685,-101.32733 0.0618,-7.15 0.0915,-13.9439 0.0661,-15.09755 -0.0254,-1.15365 0.68912,-4.62716 1.58792,-7.71892 1.40851,-4.84508 2.21848,-5.963 5.86528,-8.09516 4.05147,-2.36876 4.9953,-2.47874 22.2311,-2.59046 9.9,-0.0642 19.35,-0.0368 21,0.0609 1.65,0.0977 7.77445,-0.16484 13.60988,-0.58335 10.05877,-0.72141 10.83003,-0.6372 14.84804,1.62104 5.42381,3.04836 7.33939,6.76784 7.13195,13.84811 -0.29226,9.97506 -1.21005,12.30158 -5.86751,14.87355 -3.45209,1.90634 -5.75023,2.32963 -12.93612,2.38268 -4.80605,0.0355 -9.42407,0.45201 -10.26226,0.92561 -0.83819,0.47361 -3.74683,1.70037 -6.46364,2.72615 -6.28799,2.37413 -8.56034,6.22019 -8.56034,14.48879 0,4.66919 -0.29172,5.76064 -1.42361,5.3263 -1.20967,-0.4642 -1.2312,-0.067 -0.14325,2.64301 0.7042,1.75411 1.86913,6.06219 2.58874,9.57351 1.29797,6.33348 5.94234,14.71344 8.97812,16.19946 0.825,0.40384 4.79448,1.66213 8.82106,2.79619 4.02659,1.13407 8.75159,3.25446 10.5,4.71197 5.27113,4.39413 5.95787,6.56664 5.18049,16.38862 l -0.6913,8.7343 -5.09174,3.80134 c -4.16201,3.10723 -6.06542,3.85535 -10.42413,4.09717 -2.93282,0.1627 -6.54185,0.87878 -8.02007,1.59128 -4.09225,1.97246 -8.12928,8.54167 -9.39965,15.29546 -1.028,5.46532 -1.70193,23.64234 -1.14935,31 0.44661,5.94656 -0.58282,25.11731 -1.63778,30.5 -0.78709,4.01596 -1.89298,6.24202 -4.09852,8.25 -2.84963,2.59437 -3.55729,2.75 -12.50479,2.75 -8.67897,0 -9.48429,-0.16269 -9.48429,-1.91597 z m 374.17175,-2.5502 c -4.58054,-1.83273 -9.30554,-4.22199 -10.5,-5.30947 -1.19446,-1.08749 -4.07143,-3.1554 -6.39325,-4.59536 C 624.74146,514.3917 622,510.21973 622,506.12904 c 0,-1.53261 -1.47459,-4.17897 -3.70298,-6.64554 l -3.70299,-4.09876 -0.047,-10.15412 c -0.0482,-10.41799 1.34209,-15.65735 4.94932,-18.65108 2.45036,-2.03362 12.38303,-3.9994 15.06187,-2.98091 5.31058,2.01908 10.65593,6.24614 12.01657,9.50259 0.78206,1.87173 2.30425,3.87536 3.38265,4.4525 1.07841,0.57714 2.82074,2.99354 3.87186,5.36976 1.65383,3.73875 2.52034,4.49099 6.43617,5.58735 13.37038,3.74348 19.82996,-9.41987 12.76721,-26.01708 -2.37743,-5.58688 -4.53268,-8.50825 -10.84138,-14.69519 -4.33073,-4.24713 -11.23837,-10.06958 -15.35031,-12.93877 -7.10826,-4.95992 -10.59912,-8.39429 -21.84279,-21.48927 -5.97952,-6.96408 -13.08062,-21.34509 -14.21798,-28.79402 -1.95,-12.77109 -1.87518,-15.36444 1.0964,-38 0.87359,-6.65444 2.68232,-10.22831 7.84453,-15.5 2.15431,-2.2 4.33586,-4.69914 4.84789,-5.55363 0.87071,-1.45307 3.51377,-3.39457 14.28034,-10.48983 6.94657,-4.57784 24.53605,-6.99232 28.59176,-3.92474 1.06762,0.80751 3.44295,1.4682 5.27852,1.4682 4.64117,0 14.39653,5.16184 17.87667,9.45906 1.59702,1.97198 4.30124,5.26291 6.00936,7.31318 4.2585,5.11149 4.91827,6.59182 6.86614,15.40559 1.4616,6.61346 1.52768,8.72639 0.47665,15.24164 l -1.22017,7.56382 -5.11415,2.40865 c -4.59021,2.16188 -5.69379,2.30785 -10.7719,1.42485 -5.08972,-0.88501 -6.2443,-1.59133 -11.5,-7.03511 -3.21324,-3.32823 -6.51725,-7.45315 -7.34225,-9.1665 -2.21012,-4.58994 -7.38359,-6.8189 -12.6917,-5.46816 -5.37464,1.36768 -7.42401,3.69994 -8.03804,9.14757 -0.42187,3.74282 0.13767,5.59294 3.86827,12.79058 5.02602,9.69697 16.29588,21.55121 31.76758,33.41483 8.6588,6.63952 18.62547,17.82593 22.42007,25.16386 0.80798,1.56247 2.41513,3.69704 3.57144,4.74349 1.46396,1.32486 2.10238,3.10818 2.10238,5.87259 0,2.18348 1.20251,6.64953 2.67225,9.92454 2.57711,5.74257 2.7165,5.87164 3.91493,3.62505 0.69856,-1.30954 2.48402,-2.55094 4.07774,-2.83519 2.77774,-0.49544 2.846,-0.66735 3.37506,-8.5 0.29699,-4.39689 0.12183,-9.28531 -0.38925,-10.86316 -0.55923,-1.72653 -0.58276,-6.70373 -0.0591,-12.5 0.82695,-9.15312 0.86003,-22.30848 0.10343,-41.13118 -0.49722,-12.36978 1.05478,-48.92298 2.2473,-52.92912 2.43689,-8.18645 10.69953,-11.9877 22.84649,-10.51059 9.85698,1.19864 13.16256,3.80317 14.30441,11.27071 0.39266,2.56795 1.43215,7.144 2.30996,10.169 1.10936,3.82291 1.5719,9.31158 1.5169,18 -0.0969,15.29981 1.31957,26.68781 3.59297,28.88798 1.5358,1.48636 1.7851,1.43663 3.1982,-0.63798 2.1448,-3.14874 6.0646,-2.99111 6.8848,0.27688 1.0215,4.06981 3.317,1.24416 2.7037,-3.3281 -0.2746,-2.04764 0.2221,-8.57883 1.1038,-14.51377 0.8817,-5.93493 1.3274,-12.5149 0.9905,-14.62215 -0.8591,-5.3725 1.3466,-20.63419 3.6286,-25.10736 2.86,-5.6061 8.3131,-10.96441 11.0954,-10.90251 5.6851,0.12647 18.3198,2.76068 18.6991,3.89859 0.2277,0.68323 1.6408,2.66112 3.1402,4.39532 4.7419,5.48443 5.2171,8.42151 5.6874,35.1531 0.2419,13.75 0.857,26.575 1.367,28.5 0.5309,2.0044 0.7447,20.46295 0.5002,43.19673 -0.2347,21.8332 -0.044,43.11369 0.4247,47.28996 0.4684,4.17628 0.4783,9.03775 0.022,10.80327 -0.4562,1.76552 -1.2683,8.06511 -1.8047,13.99908 -0.5923,6.55288 -1.5828,11.71637 -2.5227,13.15088 -2.3984,3.66045 -10.3227,8.55447 -13.9314,8.60397 -1.76,0.0241 -4.9999,0.69237 -7.1999,1.48495 -2.2,0.79257 -4.47,1.44782 -5.0445,1.4561 -2.0609,0.0297 -8.2301,-9.61141 -10.2823,-16.0688 -1.7086,-5.37645 -2.1865,-10.06841 -2.6063,-25.58475 -0.5697,-21.05938 -1.29,-24.03745 -5.69,-23.52722 -2.1284,0.24682 -2.7151,-0.17749 -3.1113,-2.25 -0.2685,-1.40479 -0.1007,-2.55417 0.3731,-2.55417 1.4973,0 0.9303,-4.75954 -0.6387,-5.36163 -0.825,-0.31658 -1.5,-0.13972 -1.5,0.39301 0,1.55089 -3.0061,1.11634 -3.6362,-0.52564 -1.4261,-3.71643 -2.4522,0.46896 -2.199,8.96938 0.1877,6.30071 -0.1232,9.76978 -0.9666,10.7861 -1.1235,1.35373 -1.59423,7.35547 -2.64609,33.73878 -0.33392,8.37555 -2.37045,13.69263 -6.47664,16.9095 -6.8341,5.354 -9.59195,6.08323 -14.76037,3.90297 -1.54831,-0.65314 -4.26572,-1.26313 -6.0387,-1.35553 -2.1141,-0.11018 -4.33057,-1.25027 -6.43984,-3.31247 -1.76893,-1.72946 -3.54591,-3.14447 -3.94885,-3.14447 -0.8369,0 -2.44093,-4.8476 -3.30891,-10 -0.32429,-1.925 -1.27535,-4.81433 -2.11348,-6.42073 -1.0448,-2.00253 -1.20029,-3.2443 -0.49459,-3.95 1.18002,-1.18002 1.37638,-4.94883 0.31323,-6.01198 -0.39383,-0.39382 -1.19574,0.99368 -1.78204,3.08333 -0.77185,2.75098 -1.60904,3.79938 -3.03396,3.79938 -1.08263,0 -1.96796,-0.67481 -1.96796,-1.5 0,-0.825 -0.5625,-2.09464 -1.25,-2.82143 -0.6875,-0.72678 -1.25,-1.96428 -1.25,-2.75 0,-2.94324 -1.9622,-1.28268 -2.98863,2.52921 -0.58615,2.17678 -1.45248,4.19681 -1.92518,4.48895 -0.47271,0.29215 -1.169,2.22365 -1.54732,4.29222 -1.506,8.23457 -10.59562,18.87415 -18.12301,21.21336 -2.15372,0.66929 -6.32973,2.32232 -9.28001,3.6734 -4.3466,1.99051 -7.38173,2.53085 -16,2.84842 -10.16835,0.37469 -11.00192,0.24545 -18.9641,-2.9403 z m -270.60987,1.56629 c -0.37395,-0.60507 -1.73943,-1.10012 -3.03439,-1.10012 -1.59884,0 -3.32044,-1.31352 -5.36436,-4.09281 -2.44147,-3.31988 -3.15772,-5.53888 -3.79273,-11.75 -0.43056,-4.21146 -0.69474,-9.90719 -0.58705,-12.65719 0.10768,-2.75 -0.32113,-6.68623 -0.95291,-8.74719 -0.86283,-2.81462 -0.86422,-4.6967 -0.006,-7.5625 0.80991,-2.70326 0.84286,-4.81726 0.11305,-7.25282 -1.31398,-4.38502 -2.00954,-41.70461 -0.87003,-46.68089 0.5018,-2.19141 0.44861,-7.50647 -0.12766,-12.7566 -0.54332,-4.95 -1.01099,-10.35 -1.03926,-12 -0.28497,-16.63411 -0.32213,-51.91792 -0.0669,-63.5 0.28428,-12.89905 0.55831,-14.85397 2.48192,-17.70598 3.77895,-5.60279 9.34976,-7.2388 20.18401,-5.92755 9.38279,1.13558 11.18075,1.6648 13.29234,3.91249 4.71524,5.01914 5.45288,8.93918 5.96895,31.72104 0.26787,11.825 0.38322,25.325 0.25635,30 -0.26132,9.62923 -0.26197,8.8233 0.0637,80 0.26056,56.95135 0.1447,58.40554 -5.10082,64.02088 -2.94206,3.14949 -3.03427,3.1739 -5.61165,1.48514 -1.62661,-1.0658 -2.85716,-1.33621 -3.24463,-0.713 -0.94364,1.51774 -11.73801,2.64089 -12.56233,1.3071 z m 188.82014,-1.36268 c -7.66667,-5.25765 -9.62951,-13.14505 -8.86196,-35.61069 0.3397,-9.94286 0.13708,-16.46574 -0.57447,-18.49372 -0.73605,-2.09783 -0.81285,-5.44757 -0.23245,-10.138 0.49026,-3.96192 0.48913,-8.52326 -0.003,-10.5 -0.80098,-3.21989 -1.70426,-19.74285 -1.53043,-27.99503 0.0405,-1.925 0.12911,-23.34248 0.19681,-47.59439 0.0856,-30.67746 0.46148,-44.52209 1.2352,-45.5 0.61166,-0.77309 1.40044,-2.61403 1.75283,-4.09098 0.3524,-1.47695 2.57707,-4.27206 4.94372,-6.21135 3.91326,-3.20663 5.00307,-3.56892 12.03247,-4.00006 4.87493,-0.299 9.10133,-0.003 11.44417,0.80122 4.4757,1.53656 8.2147,6.60385 8.2147,11.13298 0,1.7829 0.66707,6.77885 1.48237,11.10211 1.21469,6.44107 1.28901,10.11765 0.41158,20.36047 -1.21078,14.13417 -1.16843,23.61861 0.11618,26.01893 1.40372,2.62288 2.15171,75.15554 0.87491,84.84086 -0.78714,5.97099 -0.79782,9.97146 -0.0374,14 2.07737,11.00499 1.67717,20.97088 -1.13759,28.32832 -4.8548,12.68986 -8.99552,15.85839 -20.5822,15.74974 -5.06092,-0.0475 -7.36503,-0.56768 -9.74586,-2.20041 z m -56.88876,-0.95903 c -2.94684,-1.58687 -3.06792,-1.80522 -1.5286,-2.75657 2.30521,-1.4247 -0.65695,-4.02184 -4.5871,-4.02184 -2.71089,0 -3.37756,-0.39476 -3.37756,-2 0,-1.1505 0.66667,-2 1.56955,-2 1.95942,0 1.56441,-4.13431 -0.45875,-4.8014 -0.94502,-0.31161 -1.13791,-0.0169 -0.60329,0.92167 0.61161,1.07374 0.50456,1.11984 -0.48266,0.20787 -0.69771,-0.64452 -1.88873,-0.93387 -2.64671,-0.64301 C 494.59313,511.56287 494,511.15892 494,510.32304 c 0,-0.8071 -1.11935,-3.11691 -2.48745,-5.13291 -1.3681,-2.01601 -2.77834,-4.89131 -3.13385,-6.38955 -0.76554,-3.22616 -4.87901,-13.67471 -6.78093,-17.22408 -0.73679,-1.375 -1.65809,-4.26746 -2.04734,-6.42768 -0.39309,-2.18157 -2.22873,-5.78388 -4.12908,-8.10299 C 473.53961,464.74941 472,462.18432 472,461.34563 c 0,-2.17891 -2.76662,-8.50686 -4.07198,-9.31362 -0.60626,-0.37468 -1.58201,-0.20152 -2.16835,0.38482 -0.67606,0.67606 -1.68928,0.73253 -2.76964,0.15434 -1.51227,-0.80935 -1.77466,-0.0707 -2.33668,6.57796 -0.34821,4.11934 -1.37634,9.762 -2.28474,12.53926 -1.533,4.68687 -1.53372,5.47363 -0.0101,10.95374 1.86297,6.70074 2.27422,27.24145 0.65821,32.87613 -1.1377,3.96688 -6.63543,10.05824 -9.07803,10.05824 -0.91793,0 -2.74216,-0.83138 -4.05383,-1.84751 -1.31167,-1.01613 -3.58055,-2.13921 -5.04196,-2.49573 -1.4614,-0.35653 -3.33911,-0.90994 -4.17268,-1.22981 -0.85053,-0.32638 -2.47101,0.37384 -3.6929,1.59573 -2.81334,2.81334 -4.223,1.4764 -4.45368,-4.22388 -0.0957,-2.36434 -0.95554,-6.93905 -1.91081,-10.16601 -0.95527,-3.22697 -1.43139,-6.60197 -1.05806,-7.5 1.0728,-2.58053 0.44923,-31.25681 -0.7275,-33.45554 -0.75419,-1.40922 -0.70017,-5.09887 0.18749,-12.80541 0.95938,-8.32915 0.97638,-11.47902 0.0737,-13.65821 -1.38647,-3.34722 -2.00488,-93.38942 -0.71918,-104.71363 1.08085,-9.51996 2.19595,-12.00727 6.95063,-15.5039 3.73918,-2.74982 4.73602,-2.99414 12.12706,-2.97224 4.42915,0.0131 9.69892,0.40635 11.7106,0.87385 5.49181,1.27624 11.14386,7.51597 14.20358,15.68041 4.58773,12.24171 6.36403,16.28648 8.38882,19.10197 1.2375,1.72076 2.26404,4.18418 2.28121,5.47428 0.0629,4.72563 7.52799,14.5914 11.37536,15.03349 2.66395,0.3061 2.72543,0.18868 3.17815,-6.07086 0.2539,-3.51065 0.77198,-6.88513 1.15127,-7.49885 0.3793,-0.61371 0.70637,-7.86636 0.72682,-16.11699 0.0434,-17.50895 1.01193,-20.25169 8.55112,-24.21558 3.70249,-1.94667 5.57772,-2.28505 10.73582,-1.93729 6.57484,0.44328 10.22629,2.15932 12.73202,5.98355 2.15507,3.28905 3.73259,24.14126 2.37992,31.45855 -0.74124,4.00973 -0.72769,6.7135 0.0466,9.29787 0.73834,2.46438 1.14593,27.07623 1.25907,76.02789 0.15223,65.87107 0.0161,72.72126 -1.51346,76.13385 -0.92441,2.0625 -2.32315,3.75 -3.10831,3.75 -2.35308,0 -2.87474,2.03791 -0.89574,3.49921 1.22733,0.90626 1.51351,1.69655 0.85014,2.34764 -1.48624,1.45872 -17.63173,2.2105 -20.00674,0.93156 z m 12.60049,-1.82858 c 2.96934,-1.58914 1.31163,-2.94983 -3.59375,-2.94983 -4.99037,0 -6.75271,1.56603 -3.31424,2.94507 3.11456,1.24913 4.58096,1.25014 6.90799,0.005 z M 1086.5,488.5765 c -1.65,-0.41985 -5.7904,-0.81661 -9.2008,-0.88169 -3.4104,-0.0651 -8.5124,-0.61407 -11.3378,-1.22001 -2.9598,-0.63476 -17.3705,-1.16455 -34.0007,-1.25 l -28.8637,-0.1483 -4.0782,-3.98196 c -2.243,-2.19008 -5.4289,-6.75445 -7.0797,-10.14305 l -3.0015,-6.16109 0.6365,-15.85695 c 0.5905,-14.71022 0.4759,-16.32701 -1.5839,-22.35695 -2.1066,-6.16683 -2.1611,-7.08945 -1.0645,-18 0.6357,-6.325 1.3415,-13.63936 1.5684,-16.25414 0.5553,-6.39812 6.7212,-17.5108 10.2004,-18.38402 1.3854,-0.34773 10.2334,-0.20367 19.6622,0.32013 9.4288,0.52379 30.1933,0.77802 46.1433,0.56495 l 29,-0.38742 3.6974,7.32025 c 2.0335,4.02614 4.1624,9.94358 4.7308,13.14988 1.6633,9.38363 4.5382,13.49673 11.6799,16.71061 6.064,2.72892 6.1119,2.78328 6.6479,7.53846 0.6755,5.9936 0.086,7.66468 -2.4224,6.86848 -2.1023,-0.66723 -5.147,1.23672 -4.2636,2.66613 0.3014,0.48768 -0.6176,0.88669 -2.0424,0.88669 -1.4247,0 -2.7735,0.5625 -2.9974,1.25 -0.2239,0.6875 -0.6582,8.52161 -0.9651,17.40912 -0.5762,16.68329 -0.8831,18.68942 -3.2888,21.49887 -0.7809,0.91189 -2.76,4.95134 -4.398,8.97653 -4.4363,10.90105 -5.6862,11.82279 -13.3783,9.86548 z m -312.5,-31 c 0,-1.1 0.6269,-2 1.393,-2 1.9997,0 2.7668,2.7247 0.9621,3.41724 C 774.1307,459.84729 774,459.76861 774,457.5765 z m 345,-22.89301 c 0,-2.53796 0.5221,-4.09336 1.5,-4.46862 2.5425,-0.97565 4.5,0.44618 4.5,3.26862 0,3.11762 -1.629,5.09301 -4.2,5.09301 -1.4251,0 -1.8,-0.81085 -1.8,-3.89301 z M 1091.3211,299.4976 c -1.1927,-1.19267 -19.1517,-3.01605 -29.3211,-2.97699 -3.575,0.0137 -11.7008,-0.22966 -18.0574,-0.54089 -9.04,-0.4426 -13.1786,-0.18514 -19,1.18196 -9.4961,2.23005 -16.84,2.01193 -24.6296,-0.73153 -5.2726,-1.85699 -6.6196,-2.85701 -9.1138,-6.76634 -2.5804,-4.04437 -3.1111,-6.26229 -4.4841,-18.73916 -1.2252,-11.13432 -1.3245,-15.6557 -0.4656,-21.20467 0.8481,-5.47897 0.7972,-8.28035 -0.228,-12.55372 -1.0333,-4.30751 -1.078,-7.0834 -0.2061,-12.79533 0.6124,-4.01194 1.3651,-11.33572 1.6726,-16.27508 0.7263,-11.66646 1.8261,-15.48806 5.4588,-18.96833 3.7857,-3.62695 7.6166,-4.22385 21.4359,-3.33994 6.1145,0.39109 25.9986,0.78778 44.1869,0.88151 22.5981,0.11647 33.5323,0.52461 34.5306,1.28892 3.0985,2.37213 8.5736,16.03803 9.8136,24.49521 1.0444,7.12258 4.6563,16.80465 7.1309,19.11481 1.5409,1.43854 4.9553,8.37419 4.9553,10.06563 0,1.06856 0.45,1.94284 1,1.94284 0.55,0 1,2.025 1,4.5 0,3.74537 0.3168,4.5 1.8892,4.5 1.0391,0 2.8041,0.7875 3.9223,1.75 2.8547,2.4573 1.3072,5.81857 -3.5788,7.77359 -2.1098,0.84416 -4.5718,2.78041 -5.4711,4.30277 -0.8992,1.52237 -2.739,3.35875 -4.0882,4.08086 -2.8871,1.54509 -4.0909,3.7969 -5.663,10.59278 -1.3622,5.88862 -8.608,19.5 -10.3804,19.5 -0.6765,0 -1.7155,-0.48551 -2.3089,-1.0789 z M 196.81747,130.03265 c 2.20178,-1.00679 3.20768,-2.09526 2.99103,-3.23655 -0.25447,-1.34046 -1.70623,-1.82984 -6.58442,-2.2196 -8.2021,-0.65533 -8.48216,-2.41643 -0.44502,-2.79847 7.27556,-0.34584 7.57315,-2.20153 0.35305,-2.20153 -2.61242,0 -5.62282,-0.63833 -6.68977,-1.41851 -1.86687,-1.36508 -1.83693,-1.44435 0.79498,-2.10492 1.50419,-0.37753 3.75365,-0.69649 4.99879,-0.70881 4.74326,-0.0469 18.37171,1.56309 20.76389,2.45296 2.48084,0.92285 2.48389,0.93897 0.39753,2.10463 -2.72714,1.52366 -8.39753,6.36456 -8.39753,7.16911 0,0.34296 0.39901,0.37697 0.88669,0.0756 1.1296,-0.69813 3.63333,2.24328 2.70213,3.17448 -0.38289,0.3829 -3.93452,0.81597 -7.8925,0.96239 -7.14232,0.2642 -7.17143,0.25482 -3.87885,-1.25075 z m 48.43253,0.88157 c -0.6875,-0.27741 -1.25,-1.35105 -1.25,-2.38587 0,-2.21508 -2.82774,-3.95185 -6.43426,-3.95185 -4.78135,0 -2.59946,-1.80432 2.68426,-2.21975 5.64,-0.44345 7.75,0.43315 7.75,3.21975 0,0.96531 0.675,2.31531 1.5,3 0.825,0.68469 1.5,1.63979 1.5,2.12244 0,0.92874 -3.64377,1.06516 -5.75,0.21528 z m 749.0864,-26.58088 c -9.3576,-8.850054 -9.5487,-9.555514 -9.4628,-34.930214 0.053,-15.74445 0.4301,-22.484947 1.347,-24.093398 0.8928,-1.566229 1.274,-7.310647 1.2762,-19.233232 0,-18.715197 0.1127,-19.139424 6.9505,-27 l 3.4795,-4 11.7866,0.305861 c 21.7738,0.565028 41.713,1.264947 51.7866,1.817847 7.058,0.387386 12.1475,0.09498 17.2993,-0.993913 8.3672,-1.76847 10.6572,-1.252895 14.4487,3.253079 3.9116,4.648658 6.6689,15.294365 8.3187,32.117126 0.6422,6.548723 2.5303,12.041595 5.2331,15.224792 1.095,1.289514 1.2924,3.022298 0.7825,6.866168 -0.5158,3.88836 -0.3194,5.54201 0.8056,6.78523 1.5199,1.67944 1.9005,7.02307 1.331,18.68922 -0.313,6.4122 -0.9897,7.58668 -10.8385,18.8099 -1.9907,2.268584 -3.9373,5.149184 -4.3258,6.401334 -0.3885,1.25215 -1.8214,3.0073 -3.1844,3.90033 -2.3312,1.52751 -2.7509,1.48741 -7.0846,-0.67696 -4.4686,-2.2317 -5.1189,-2.2787 -21.6961,-1.56836 -9.3992,0.40275 -24.7395,0.87025 -34.0895,1.03888 -9.35,0.16863 -18.572,0.80675 -20.4934,1.41804 -6.0584,1.9275 -7.8294,1.39223 -13.6702,-4.13173 z m 117.8502,-24.006844 c 0.2756,-2.85772 0.7057,-3.28782 3.5634,-3.56336 1.8845,-0.1817 3.25,0.14819 3.25,0.78518 0,2.20727 -3.2823,6.02818 -5.1784,6.02818 -1.5957,0 -1.8916,-0.58816 -1.635,-3.25 z"
+         id="path3107"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

diff --git a/icons/finish.jpg b/icons/finish.jpg
new file mode 100644 (file)
index 0000000..3bfc27a
Binary files /dev/null and b/icons/finish.jpg differ

diff --git a/icons/finish2.jpg b/icons/finish2.jpg
new file mode 100644 (file)
index 0000000..f05a2e7
Binary files /dev/null and b/icons/finish2.jpg differ

diff --git a/icons/finish3.jpg b/icons/finish3.jpg
new file mode 100644 (file)
index 0000000..b1fc475
Binary files /dev/null and b/icons/finish3.jpg differ

diff --git a/run/alignomatic b/run/alignomatic
new file mode 100755 (executable)
index 0000000..9cc8c22
--- /dev/null
+++ b/run/alignomatic
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:build/src/gtk:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    gdb --args build/src/tools/alignomatic $2
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" build/src/tools/alignomatic $2
+else
+    build/src/tools/alignomatic "$1"
+fi

diff --git a/run/dvdomatic b/run/dvdomatic
new file mode 100755 (executable)
index 0000000..23b7d22
--- /dev/null
+++ b/run/dvdomatic
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:build/src/gtk:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    gdb --args build/src/tools/dvdomatic $2
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" build/src/tools/dvdomatic $2
+else
+    build/src/tools/dvdomatic "$1"
+fi

diff --git a/run/fixlengths b/run/fixlengths
new file mode 100755 (executable)
index 0000000..1a6cc0a
--- /dev/null
+++ b/run/fixlengths
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH:build/src
+if [ "$1" == "--debug" ]; then
+    gdb --args build/src/tools/fixlengths "$@"
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/fixlengths "$@"
+else
+    build/src/tools/fixlengths "$@"
+fi

diff --git a/run/long-tests b/run/long-tests
new file mode 100755 (executable)
index 0000000..6c29254
--- /dev/null
+++ b/run/long-tests
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    gdb --args build/test/long-unit-tests
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" --leak-check=full build/test/long-unit-tests
+else
+    build/test/long-unit-tests
+fi

diff --git a/run/makedcp b/run/makedcp
new file mode 100755 (executable)
index 0000000..f5adbd9
--- /dev/null
+++ b/run/makedcp
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH:build/src
+if [ "$1" == "--debug" ]; then
+    gdb --args build/src/tools/makedcp "$@"
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/makedcp "$@"
+else
+    build/src/tools/makedcp "$@"
+fi

diff --git a/run/playomatic b/run/playomatic
new file mode 100755 (executable)
index 0000000..9fe191a
--- /dev/null
+++ b/run/playomatic
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:build/src/gtk:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    gdb --args build/src/tools/playomatic $2
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" build/src/tools/playomatic $2
+else
+    build/src/tools/playomatic "$1"
+fi

diff --git a/run/servomatic b/run/servomatic
new file mode 100755 (executable)
index 0000000..100d0a8
--- /dev/null
+++ b/run/servomatic
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    gdb --args build/src/tools/servomatic
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" build/src/tools/servomatic
+else
+    build/src/tools/servomatic
+fi

diff --git a/run/servomatictest b/run/servomatictest
new file mode 100755 (executable)
index 0000000..58cea88
--- /dev/null
+++ b/run/servomatictest
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    shift
+    gdb --args build/src/tools/servomatictest $*
+elif [ "$1" == "--valgrind" ]; then
+    shift
+    valgrind --tool="memcheck" build/src/tools/servomatictest $*
+else
+    build/src/tools/servomatictest $*
+fi

diff --git a/run/short-tests b/run/short-tests
new file mode 100755 (executable)
index 0000000..4f25670
--- /dev/null
+++ b/run/short-tests
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
+if [ "$1" == "--debug" ]; then
+    gdb --args build/test/short-unit-tests
+elif [ "$1" == "--valgrind" ]; then
+    valgrind --tool="memcheck" --leak-check=full build/test/short-unit-tests
+else
+    build/test/short-unit-tests
+fi
+

diff --git a/splitchapters b/splitchapters
new file mode 100755 (executable)
index 0000000..1e5cff0
--- /dev/null
+++ b/splitchapters
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+
+import os
+import sys
+
+if len(sys.argv) < 2:
+    print 'Syntax: %s <DVD-image>' % sys.argv[0]
+    sys.exit(1)
+
+lsdvd = os.popen('lsdvd -c "%s"' % sys.argv[1])
+lines = lsdvd.readlines()
+
+N = None
+
+for l in lines:
+    w = l.split()
+    if len(w) > 5 and w[4] == 'Chapters:':
+        N = int(w[5][:-1])
+
+if N == None:
+    print 'Could not get chapter count.'
+    sys.exit(1)
+
+for i in range(1, N + 1):
+    os.mkdir('%d' % i)
+    c = 'mplayer dvd:// -chapter %d-%d -dvd-device "%s" -dumpstream -dumpfile %d/%d.vob' % (i, i, sys.argv[1], i, i)
+    print c
+    os.system(c)
+
+

diff --git a/src/gtk/alignment.cc b/src/gtk/alignment.cc
new file mode 100644 (file)
index 0000000..ee4ca51
--- /dev/null
+++ b/src/gtk/alignment.cc
@@ -0,0 +1,167 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <gtkmm.h>
+#include <cairomm/cairomm.h>
+#include "alignment.h"
+
+using namespace std;
+
+class AlignmentWidget : public Gtk::DrawingArea
+{
+public:
+       void set_text_line (int n, string t)
+       {
+               if (int(_text.size()) < (n + 1)) {
+                       _text.resize (n + 1);
+               }
+               
+               _text[n] = t;
+               queue_draw ();
+       }
+       
+private:       
+       bool on_expose_event (GdkEventExpose* ev)
+       {
+               if (!get_window ()) {
+                       return false;
+               }
+               
+               Cairo::RefPtr<Cairo::Context> c = get_window()->create_cairo_context ();
+               
+               Gtk::Allocation a = get_allocation ();
+               int const w = a.get_width ();
+               int const h = a.get_height ();
+               
+               c->rectangle (0, 0, w, h);
+               c->set_source_rgb (0, 0, 0);
+               c->fill ();
+               
+               c->set_source_rgb (1, 1, 1);
+               c->set_line_width (1);
+               
+               int const arrow_size = h / 8;
+               int const head_size = h / 32;
+               
+               /* arrow to left edge */
+               c->move_to (arrow_size, h / 2);
+               c->line_to (0, h / 2);
+               c->rel_line_to (head_size, head_size);
+               c->move_to (0, h / 2);
+               c->rel_line_to (head_size, -head_size);
+               c->stroke ();
+               
+               /* arrow to right edge */
+               c->move_to (w - arrow_size, h / 2);
+               c->line_to (w, h / 2);
+               c->rel_line_to (-head_size, head_size);
+               c->move_to (w, h / 2);
+               c->rel_line_to (-head_size, -head_size);
+               c->stroke ();
+               
+               /* arrow to top edge */
+               c->move_to (w / 2, arrow_size);
+               c->line_to (w / 2, 0);
+               c->rel_line_to (head_size, head_size);
+               c->move_to (w / 2, 0);
+               c->rel_line_to (-head_size, head_size);
+               c->stroke ();
+               
+               /* arrow to bottom edge */
+               c->move_to (w / 2, h - h / 8);
+               c->line_to (w / 2, h);
+               c->rel_line_to (head_size, -head_size);
+               c->move_to (w / 2, h);
+               c->rel_line_to (-head_size, -head_size);
+               c->stroke ();
+               
+               /* arrow to top-left corner */
+               c->move_to (arrow_size, arrow_size);
+               c->line_to (0, 0);
+               c->rel_line_to (head_size, 0);
+               c->move_to (0, 0);
+               c->rel_line_to (0, head_size);
+               c->stroke ();
+               
+               /* arrow to top-right corner */
+               c->move_to (w - arrow_size, arrow_size);
+               c->line_to (w, 0);
+               c->rel_line_to (0, head_size);
+               c->move_to (w, 0);
+               c->rel_line_to (-head_size, 0);
+               c->stroke ();
+               
+               /* arrow to bottom-left corner */
+               c->move_to (arrow_size, h - arrow_size);
+               c->line_to (0, h);
+               c->rel_line_to (head_size, 0);
+               c->move_to (0, h);
+               c->rel_line_to (0, -head_size);
+               c->stroke ();
+               
+               /* arrow to bottom-right corner */
+               c->move_to (w - arrow_size, h - arrow_size);
+               c->line_to (w, h);
+               c->rel_line_to (-head_size, 0);
+               c->line_to (w, h);
+               c->rel_line_to (0, -head_size);
+               c->stroke ();
+               
+               /* text */
+               int max_height = 0;
+               for (vector<string>::iterator i = _text.begin(); i != _text.end(); ++i) {
+                       Cairo::TextExtents e;
+                       c->get_text_extents (*i, e);
+                       max_height = max (max_height, int (e.height));
+               }
+               
+               int total_height = max_height * _text.size() * 2;
+               
+               for (vector<string>::size_type i = 0; i < _text.size(); ++i) {
+                       Cairo::TextExtents e;
+                       c->get_text_extents (_text[i], e);
+                       c->move_to ((w - e.width) / 2, ((h - total_height) / 2) + ((i * 2) + 1) *  max_height);
+                       c->text_path (_text[i]);
+                       c->stroke ();
+               }
+               
+               return true;
+       }
+
+       std::vector<std::string> _text;
+};
+
+Alignment::Alignment (Position p, Size s)
+{
+       _widget = Gtk::manage (new AlignmentWidget);
+       add (*_widget);
+       show_all ();
+       
+       set_decorated (false);
+       set_resizable (false);
+       set_size_request (s.width, s.height);
+       move (p.x, p.y);
+}
+
+void
+Alignment::set_text_line (int n, string t)
+{
+       _widget->set_text_line (n, t);
+}

diff --git a/src/gtk/alignment.h b/src/gtk/alignment.h
new file mode 100644 (file)
index 0000000..fb740b7
--- /dev/null
+++ b/src/gtk/alignment.h
@@ -0,0 +1,35 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <gtkmm.h>
+#include <string>
+#include "lib/util.h"
+
+class AlignmentWidget;
+
+class Alignment : public Gtk::Window
+{
+public:
+       Alignment (Position, Size);
+
+       void set_text_line (int, std::string);
+
+private:
+       AlignmentWidget* _widget;
+};

diff --git a/src/gtk/config_dialog.cc b/src/gtk/config_dialog.cc
new file mode 100644 (file)
index 0000000..03f5b99
--- /dev/null
+++ b/src/gtk/config_dialog.cc
@@ -0,0 +1,369 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/config_dialog.cc
+ *  @brief A dialogue to edit DVD-o-matic configuration.
+ */
+
+#include <iostream>
+#include <boost/lexical_cast.hpp>
+#include "lib/config.h"
+#include "lib/server.h"
+#include "lib/screen.h"
+#include "lib/format.h"
+#include "lib/scaler.h"
+#include "lib/filter.h"
+#include "config_dialog.h"
+#include "gtk_util.h"
+#include "filter_dialog.h"
+
+using namespace std;
+using namespace boost;
+
+ConfigDialog::ConfigDialog ()
+       : Gtk::Dialog ("DVD-o-matic Configuration")
+       , _reference_filters_button ("Edit...")
+       , _add_server ("Add Server")
+       , _remove_server ("Remove Server")
+       , _add_screen ("Add Screen")
+       , _remove_screen ("Remove Screen")
+{
+       Gtk::Table* t = manage (new Gtk::Table);
+       t->set_row_spacings (6);
+       t->set_col_spacings (6);
+       t->set_border_width (6);
+
+       Config* config = Config::instance ();
+
+       _tms_ip.set_text (config->tms_ip ());
+       _tms_ip.signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::tms_ip_changed));
+       _tms_path.set_text (config->tms_path ());
+       _tms_path.signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::tms_path_changed));
+       _tms_user.set_text (config->tms_user ());
+       _tms_user.signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::tms_user_changed));
+       _tms_password.set_text (config->tms_password ());
+       _tms_password.signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::tms_password_changed));
+
+       _num_local_encoding_threads.set_range (1, 128);
+       _num_local_encoding_threads.set_increments (1, 4);
+       _num_local_encoding_threads.set_value (config->num_local_encoding_threads ());
+       _num_local_encoding_threads.signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::num_local_encoding_threads_changed));
+
+       _colour_lut.append_text ("sRGB");
+       _colour_lut.append_text ("Rec 709");
+       _colour_lut.set_active (config->colour_lut_index ());
+       _colour_lut.signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::colour_lut_changed));
+       
+       _j2k_bandwidth.set_range (50, 250);
+       _j2k_bandwidth.set_increments (10, 50);
+       _j2k_bandwidth.set_value (config->j2k_bandwidth() / 1e6);
+       _j2k_bandwidth.signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::j2k_bandwidth_changed));
+
+       vector<Scaler const *> const sc = Scaler::all ();
+       for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
+               _reference_scaler.append_text ((*i)->name ());
+       }
+       _reference_scaler.set_active (Scaler::as_index (config->reference_scaler ()));
+       _reference_scaler.signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::reference_scaler_changed));
+
+       _reference_filters.set_alignment (0, 0.5);
+       pair<string, string> p = Filter::ffmpeg_strings (config->reference_filters ());
+       _reference_filters.set_text (p.first + " " + p.second);
+       _reference_filters_button.signal_clicked().connect (sigc::mem_fun (*this, &ConfigDialog::edit_reference_filters_clicked));
+
+       _servers_store = Gtk::ListStore::create (_servers_columns);
+       vector<Server*> servers = config->servers ();
+       for (vector<Server*>::iterator i = servers.begin(); i != servers.end(); ++i) {
+               add_server_to_store (*i);
+       }
+       
+       _servers_view.set_model (_servers_store);
+       _servers_view.append_column_editable ("Host Name", _servers_columns._host_name);
+       _servers_view.append_column_editable ("Threads", _servers_columns._threads);
+
+       _add_server.signal_clicked().connect (sigc::mem_fun (*this, &ConfigDialog::add_server_clicked));
+       _remove_server.signal_clicked().connect (sigc::mem_fun (*this, &ConfigDialog::remove_server_clicked));
+
+       _servers_view.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::server_selection_changed));
+       server_selection_changed ();
+       
+       _screens_store = Gtk::TreeStore::create (_screens_columns);
+       vector<shared_ptr<Screen> > screens = config->screens ();
+       for (vector<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
+               add_screen_to_store (*i);
+       }
+
+       _screens_view.set_model (_screens_store);
+       _screens_view.append_column_editable ("Screen", _screens_columns._name);
+       _screens_view.append_column ("Format", _screens_columns._format_name);
+       _screens_view.append_column_editable ("x", _screens_columns._x);
+       _screens_view.append_column_editable ("y", _screens_columns._y);
+       _screens_view.append_column_editable ("Width", _screens_columns._width);
+       _screens_view.append_column_editable ("Height", _screens_columns._height);
+
+       _add_screen.signal_clicked().connect (sigc::mem_fun (*this, &ConfigDialog::add_screen_clicked));
+       _remove_screen.signal_clicked().connect (sigc::mem_fun (*this, &ConfigDialog::remove_screen_clicked));
+
+       _screens_view.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &ConfigDialog::screen_selection_changed));
+       screen_selection_changed ();
+
+       int n = 0;
+       t->attach (left_aligned_label ("TMS IP address"), 0, 1, n, n + 1);
+       t->attach (_tms_ip, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("TMS target path"), 0, 1, n, n + 1);
+       t->attach (_tms_path, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("TMS user name"), 0, 1, n, n + 1);
+       t->attach (_tms_user, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("TMS password"), 0, 1, n, n + 1);
+       t->attach (_tms_password, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Threads to use for encoding on this host"), 0, 1, n, n + 1);
+       t->attach (_num_local_encoding_threads, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Colour look-up table"), 0, 1, n, n + 1);
+       t->attach (_colour_lut, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("JPEG2000 bandwidth"), 0, 1, n, n + 1);
+       t->attach (_j2k_bandwidth, 1, 2, n, n + 1);
+       t->attach (left_aligned_label ("MBps"), 2, 3, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Reference scaler for A/B"), 0, 1, n, n + 1);
+       t->attach (_reference_scaler, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Reference filters for A/B"), 0, 1, n, n + 1);
+       Gtk::HBox* fb = Gtk::manage (new Gtk::HBox);
+       fb->set_spacing (4);
+       fb->pack_start (_reference_filters, true, true);
+       fb->pack_start (_reference_filters_button, false, false);
+       t->attach (*fb, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Encoding Servers"), 0, 1, n, n + 1);
+       t->attach (_servers_view, 1, 2, n, n + 1);
+       Gtk::VBox* b = manage (new Gtk::VBox);
+       b->pack_start (_add_server, false, false);
+       b->pack_start (_remove_server, false, false);
+       t->attach (*b, 2, 3, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Screens"), 0, 1, n, n + 1);
+       t->attach (_screens_view, 1, 2, n, n + 1);
+       b = manage (new Gtk::VBox);
+       b->pack_start (_add_screen, false, false);
+       b->pack_start (_remove_screen, false, false);
+       t->attach (*b, 2, 3, n, n + 1);
+       ++n;
+
+       t->show_all ();
+       get_vbox()->pack_start (*t);
+
+       get_vbox()->set_border_width (24);
+
+       add_button ("Close", Gtk::RESPONSE_CLOSE);
+}
+
+void
+ConfigDialog::tms_ip_changed ()
+{
+       Config::instance()->set_tms_ip (_tms_ip.get_text ());
+}
+
+void
+ConfigDialog::tms_path_changed ()
+{
+       Config::instance()->set_tms_path (_tms_path.get_text ());
+}
+
+void
+ConfigDialog::tms_user_changed ()
+{
+       Config::instance()->set_tms_user (_tms_user.get_text ());
+}
+
+void
+ConfigDialog::tms_password_changed ()
+{
+       Config::instance()->set_tms_password (_tms_password.get_text ());
+}
+
+
+void
+ConfigDialog::num_local_encoding_threads_changed ()
+{
+       Config::instance()->set_num_local_encoding_threads (_num_local_encoding_threads.get_value ());
+}
+
+void
+ConfigDialog::colour_lut_changed ()
+{
+       Config::instance()->set_colour_lut_index (_colour_lut.get_active_row_number ());
+}
+
+void
+ConfigDialog::j2k_bandwidth_changed ()
+{
+       Config::instance()->set_j2k_bandwidth (_j2k_bandwidth.get_value() * 1e6);
+}
+
+void
+ConfigDialog::on_response (int r)
+{
+       vector<Server*> servers;
+       
+       Gtk::TreeModel::Children c = _servers_store->children ();
+       for (Gtk::TreeModel::Children::iterator i = c.begin(); i != c.end(); ++i) {
+               Gtk::TreeModel::Row r = *i;
+               Server* s = new Server (r[_servers_columns._host_name], r[_servers_columns._threads]);
+               servers.push_back (s);
+       }
+
+       Config::instance()->set_servers (servers);
+
+       vector<shared_ptr<Screen> > screens;
+
+       c = _screens_store->children ();
+       for (Gtk::TreeModel::Children::iterator i = c.begin(); i != c.end(); ++i) {
+
+               Gtk::TreeModel::Row r = *i;
+               shared_ptr<Screen> s (new Screen (r[_screens_columns._name]));
+
+               Gtk::TreeModel::Children cc = r.children ();
+               for (Gtk::TreeModel::Children::iterator j = cc.begin(); j != cc.end(); ++j) {
+                       Gtk::TreeModel::Row r = *j;
+                       string const x_ = r[_screens_columns._x];
+                       string const y_ = r[_screens_columns._y];
+                       string const width_ = r[_screens_columns._width];
+                       string const height_ = r[_screens_columns._height];
+                       s->set_geometry (
+                               Format::from_nickname (r[_screens_columns._format_nickname]),
+                               Position (lexical_cast<int> (x_), lexical_cast<int> (y_)),
+                               Size (lexical_cast<int> (width_), lexical_cast<int> (height_))
+                               );
+               }
+
+               screens.push_back (s);
+       }
+       
+       Config::instance()->set_screens (screens);
+       
+       Gtk::Dialog::on_response (r);
+}
+
+void
+ConfigDialog::add_server_to_store (Server* s)
+{
+       Gtk::TreeModel::iterator i = _servers_store->append ();
+       Gtk::TreeModel::Row r = *i;
+       r[_servers_columns._host_name] = s->host_name ();
+       r[_servers_columns._threads] = s->threads ();
+}
+
+void
+ConfigDialog::add_server_clicked ()
+{
+       Server s ("localhost", 1);
+       add_server_to_store (&s);
+}
+
+void
+ConfigDialog::remove_server_clicked ()
+{
+       Gtk::TreeModel::iterator i = _servers_view.get_selection()->get_selected ();
+       if (i) {
+               _servers_store->erase (i);
+       }
+}
+
+void
+ConfigDialog::server_selection_changed ()
+{
+       Gtk::TreeModel::iterator i = _servers_view.get_selection()->get_selected ();
+       _remove_server.set_sensitive (i);
+}
+       
+
+void
+ConfigDialog::add_screen_to_store (shared_ptr<Screen> s)
+{
+       Gtk::TreeModel::iterator i = _screens_store->append ();
+       Gtk::TreeModel::Row r = *i;
+       r[_screens_columns._name] = s->name ();
+
+       Screen::GeometryMap geoms = s->geometries ();
+       for (Screen::GeometryMap::const_iterator j = geoms.begin(); j != geoms.end(); ++j) {
+               i = _screens_store->append (r.children ());
+               Gtk::TreeModel::Row c = *i;
+               c[_screens_columns._format_name] = j->first->name ();
+               c[_screens_columns._format_nickname] = j->first->nickname ();
+               c[_screens_columns._x] = lexical_cast<string> (j->second.position.x);
+               c[_screens_columns._y] = lexical_cast<string> (j->second.position.y);
+               c[_screens_columns._width] = lexical_cast<string> (j->second.size.width);
+               c[_screens_columns._height] = lexical_cast<string> (j->second.size.height);
+       }
+}
+
+void
+ConfigDialog::add_screen_clicked ()
+{
+       shared_ptr<Screen> s (new Screen ("New Screen"));
+       add_screen_to_store (s);
+}
+
+void
+ConfigDialog::remove_screen_clicked ()
+{
+       Gtk::TreeModel::iterator i = _screens_view.get_selection()->get_selected ();
+       if (i) {
+               _screens_store->erase (i);
+       }
+}
+
+void
+ConfigDialog::screen_selection_changed ()
+{
+       Gtk::TreeModel::iterator i = _screens_view.get_selection()->get_selected ();
+       _remove_screen.set_sensitive (i);
+}
+       
+
+void
+ConfigDialog::reference_scaler_changed ()
+{
+       int const n = _reference_scaler.get_active_row_number ();
+       if (n >= 0) {
+               Config::instance()->set_reference_scaler (Scaler::from_index (n));
+       }
+}
+
+void
+ConfigDialog::edit_reference_filters_clicked ()
+{
+       FilterDialog d (Config::instance()->reference_filters ());
+       d.ActiveChanged.connect (sigc::mem_fun (*this, &ConfigDialog::reference_filters_changed));
+       d.run ();
+}
+
+void
+ConfigDialog::reference_filters_changed (vector<Filter const *> f)
+{
+       Config::instance()->set_reference_filters (f);
+       pair<string, string> p = Filter::ffmpeg_strings (Config::instance()->reference_filters ());
+       _reference_filters.set_text (p.first + " " + p.second);
+}

diff --git a/src/gtk/config_dialog.h b/src/gtk/config_dialog.h
new file mode 100644 (file)
index 0000000..ec34575
--- /dev/null
+++ b/src/gtk/config_dialog.h
@@ -0,0 +1,113 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/config_dialog.h
+ *  @brief A dialogue to edit DVD-o-matic configuration.
+ */
+
+#include <gtkmm.h>
+
+class Screen;
+class Server;
+
+/** @class ConfigDialog
+ *  @brief A dialogue to edit DVD-o-matic configuration.
+ */
+class ConfigDialog : public Gtk::Dialog
+{
+public:
+       ConfigDialog ();
+
+private:
+       void on_response (int);
+
+       void tms_ip_changed ();
+       void tms_path_changed ();
+       void tms_user_changed ();
+       void tms_password_changed ();
+       void num_local_encoding_threads_changed ();
+       void colour_lut_changed ();
+       void j2k_bandwidth_changed ();
+       void add_server_clicked ();
+       void remove_server_clicked ();
+       void server_selection_changed ();
+       void add_screen_clicked ();
+       void remove_screen_clicked ();
+       void screen_selection_changed ();
+       void reference_scaler_changed ();
+       void edit_reference_filters_clicked ();
+       void reference_filters_changed (std::vector<Filter const *>);
+
+       void add_screen_to_store (boost::shared_ptr<Screen>);
+       void add_server_to_store (Server *);
+
+       struct ServersModelColumns : public Gtk::TreeModelColumnRecord
+       {
+               ServersModelColumns () {
+                       add (_host_name);
+                       add (_threads);
+               }
+
+               Gtk::TreeModelColumn<std::string> _host_name;
+               Gtk::TreeModelColumn<int> _threads;
+       };
+
+       struct ScreensModelColumns : public Gtk::TreeModelColumnRecord
+       {
+               ScreensModelColumns () {
+                       add (_name);
+                       add (_format_name);
+                       add (_format_nickname);
+                       add (_x);
+                       add (_y);
+                       add (_width);
+                       add (_height);
+               }
+
+               Gtk::TreeModelColumn<std::string> _name;
+               Gtk::TreeModelColumn<std::string> _format_name;
+               Gtk::TreeModelColumn<std::string> _format_nickname;
+               Gtk::TreeModelColumn<std::string> _x;
+               Gtk::TreeModelColumn<std::string> _y;
+               Gtk::TreeModelColumn<std::string> _width;
+               Gtk::TreeModelColumn<std::string> _height;
+       };
+
+       Gtk::Entry _tms_ip;
+       Gtk::Entry _tms_path;
+       Gtk::Entry _tms_user;
+       Gtk::Entry _tms_password;
+       Gtk::SpinButton _num_local_encoding_threads;
+       Gtk::ComboBoxText _colour_lut;
+       Gtk::SpinButton _j2k_bandwidth;
+       Gtk::ComboBoxText _reference_scaler;
+       Gtk::Label _reference_filters;
+       Gtk::Button _reference_filters_button;
+       ServersModelColumns _servers_columns;
+       Glib::RefPtr<Gtk::ListStore> _servers_store;
+       Gtk::TreeView _servers_view;
+       Gtk::Button _add_server;
+       Gtk::Button _remove_server;
+       ScreensModelColumns _screens_columns;
+       Glib::RefPtr<Gtk::TreeStore> _screens_store;
+       Gtk::TreeView _screens_view;
+       Gtk::Button _add_screen;
+       Gtk::Button _remove_screen;
+};
+

diff --git a/src/gtk/dcp_range_dialog.cc b/src/gtk/dcp_range_dialog.cc
new file mode 100644 (file)
index 0000000..d1fef0e
--- /dev/null
+++ b/src/gtk/dcp_range_dialog.cc
@@ -0,0 +1,117 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "dcp_range_dialog.h"
+#include "lib/film.h"
+
+DCPRangeDialog::DCPRangeDialog (Film* f)
+       : _film (f)
+       , _whole ("Whole film")
+       , _first ("First")
+       , _cut ("Cut remainder")
+       , _black_out ("Black-out remainder")
+{
+       set_title ("DCP range");
+
+       Gtk::Table* table = Gtk::manage (new Gtk::Table ());
+       table->set_border_width (6);
+       table->set_row_spacings (6);
+       table->set_col_spacings (6);
+       table->attach (_whole, 0, 4, 0, 1);
+       table->attach (_first, 0, 1, 1, 2);
+       table->attach (_n_frames, 1, 2, 1, 2);
+       table->attach (*manage (new Gtk::Label ("frames")), 2, 3, 1, 2);
+       table->attach (_cut, 1, 2, 2, 3);
+       table->attach (_black_out, 1, 2, 3, 4);
+
+       Gtk::RadioButtonGroup g = _whole.get_group ();
+       _first.set_group (g);
+
+       g = _black_out.get_group ();
+       _cut.set_group (g);
+
+       _n_frames.set_range (1, INT_MAX - 1);
+       _n_frames.set_increments (24, 24 * 60);
+       if (_film->dcp_frames() > 0) {
+               _whole.set_active (false);
+               _first.set_active (true);
+               _n_frames.set_value (_film->dcp_frames ());
+       } else {
+               _whole.set_active (true);
+               _first.set_active (false);
+               _n_frames.set_value (24);
+       }
+
+       _black_out.set_active (_film->dcp_trim_action() == BLACK_OUT);
+       _cut.set_active (_film->dcp_trim_action() == CUT);
+
+       _whole.signal_toggled().connect (sigc::mem_fun (*this, &DCPRangeDialog::whole_toggled));
+       _cut.signal_toggled().connect (sigc::mem_fun (*this, &DCPRangeDialog::cut_toggled));
+       _n_frames.signal_value_changed().connect (sigc::mem_fun (*this, &DCPRangeDialog::n_frames_changed));
+
+       get_vbox()->pack_start (*table);
+
+       add_button ("Close", Gtk::RESPONSE_CLOSE);
+       show_all_children ();
+
+       set_sensitivity ();
+}
+
+void
+DCPRangeDialog::whole_toggled ()
+{
+       set_sensitivity ();
+       emit_changed ();
+}
+
+void
+DCPRangeDialog::set_sensitivity ()
+{
+       _n_frames.set_sensitive (_first.get_active ());
+       _black_out.set_sensitive (_first.get_active ());
+       _cut.set_sensitive (_first.get_active ());
+}
+
+void
+DCPRangeDialog::cut_toggled ()
+{
+       emit_changed ();
+}
+
+void
+DCPRangeDialog::n_frames_changed ()
+{
+       emit_changed ();
+}
+
+void
+DCPRangeDialog::emit_changed ()
+{
+       int frames = 0;
+       if (!_whole.get_active ()) {
+               frames = _n_frames.get_value_as_int ();
+       }
+
+       TrimAction action = CUT;
+       if (_black_out.get_active ()) {
+               action = BLACK_OUT;
+       }
+
+       Changed (frames, action);
+}

diff --git a/src/gtk/dcp_range_dialog.h b/src/gtk/dcp_range_dialog.h
new file mode 100644 (file)
index 0000000..7469a25
--- /dev/null
+++ b/src/gtk/dcp_range_dialog.h
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <gtkmm.h>
+#include "lib/trim_action.h"
+
+class Film;
+
+class DCPRangeDialog : public Gtk::Dialog
+{
+public:
+       DCPRangeDialog (Film *);
+
+       sigc::signal2<void, int, TrimAction> Changed;
+
+private:
+       void whole_toggled ();
+       void cut_toggled ();
+       void n_frames_changed ();
+       
+       void set_sensitivity ();
+       void emit_changed ();
+       
+       Film* _film;
+       Gtk::RadioButton _whole;
+       Gtk::RadioButton _first;
+       Gtk::SpinButton _n_frames;
+       Gtk::RadioButton _cut;
+       Gtk::RadioButton _black_out;
+};

diff --git a/src/gtk/film_editor.cc b/src/gtk/film_editor.cc
new file mode 100644 (file)
index 0000000..0e410aa
--- /dev/null
+++ b/src/gtk/film_editor.cc
@@ -0,0 +1,572 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/film_editor.cc
+ *  @brief A GTK widget to edit a film's metadata, and perform various functions.
+ */
+
+#include <iostream>
+#include <gtkmm.h>
+#include <boost/thread.hpp>
+#include <boost/filesystem.hpp>
+#include "lib/format.h"
+#include "lib/film.h"
+#include "lib/transcode_job.h"
+#include "lib/exceptions.h"
+#include "lib/ab_transcode_job.h"
+#include "lib/thumbs_job.h"
+#include "lib/make_mxf_job.h"
+#include "lib/job_manager.h"
+#include "lib/filter.h"
+#include "lib/screen.h"
+#include "lib/config.h"
+#include "lib/scp_dcp_job.h"
+#include "filter_dialog.h"
+#include "gtk_util.h"
+#include "film_editor.h"
+#include "dcp_range_dialog.h"
+
+using namespace std;
+using namespace boost;
+using namespace Gtk;
+
+/** @param f Film to edit */
+FilmEditor::FilmEditor (Film* f)
+       : _film (f)
+       , _filters_button ("Edit...")
+       , _change_dcp_range_button ("Edit...")
+       , _dcp_ab ("A/B")
+{
+       _vbox.set_border_width (12);
+       _vbox.set_spacing (12);
+       
+       /* Set up our editing widgets */
+       _left_crop.set_range (0, 1024);
+       _left_crop.set_increments (1, 16);
+       _top_crop.set_range (0, 1024);
+       _top_crop.set_increments (1, 16);
+       _right_crop.set_range (0, 1024);
+       _right_crop.set_increments (1, 16);
+       _bottom_crop.set_range (0, 1024);
+       _bottom_crop.set_increments (1, 16);
+       _filters.set_alignment (0, 0.5);
+       _audio_gain.set_range (-60, 60);
+       _audio_gain.set_increments (1, 3);
+       _audio_delay.set_range (-1000, 1000);
+       _audio_delay.set_increments (1, 20);
+       _still_duration.set_range (0, 60 * 60);
+       _still_duration.set_increments (1, 5);
+       _dcp_range.set_alignment (0, 0.5);
+
+       vector<Format const *> fmt = Format::all ();
+       for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
+               _format.append_text ((*i)->name ());
+       }
+
+       _frames_per_second.set_increments (1, 5);
+       _frames_per_second.set_digits (2);
+       _frames_per_second.set_range (0, 60);
+
+       vector<DCPContentType const *> const ct = DCPContentType::all ();
+       for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
+               _dcp_content_type.append_text ((*i)->pretty_name ());
+       }
+
+       vector<Scaler const *> const sc = Scaler::all ();
+       for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
+               _scaler.append_text ((*i)->name ());
+       }
+       
+       _original_size.set_alignment (0, 0.5);
+       _length.set_alignment (0, 0.5);
+       _audio.set_alignment (0, 0.5);
+
+       /* And set their values from the Film */
+       set_film (f);
+       
+       /* Now connect to them, since initial values are safely set */
+       _name.signal_changed().connect (sigc::mem_fun (*this, &FilmEditor::name_changed));
+       _frames_per_second.signal_changed().connect (sigc::mem_fun (*this, &FilmEditor::frames_per_second_changed));
+       _format.signal_changed().connect (sigc::mem_fun (*this, &FilmEditor::format_changed));
+       _content.signal_file_set().connect (sigc::mem_fun (*this, &FilmEditor::content_changed));
+       _left_crop.signal_value_changed().connect (sigc::mem_fun (*this, &FilmEditor::left_crop_changed));
+       _right_crop.signal_value_changed().connect (sigc::mem_fun (*this, &FilmEditor::right_crop_changed));
+       _top_crop.signal_value_changed().connect (sigc::mem_fun (*this, &FilmEditor::top_crop_changed));
+       _bottom_crop.signal_value_changed().connect (sigc::mem_fun (*this, &FilmEditor::bottom_crop_changed));
+       _filters_button.signal_clicked().connect (sigc::mem_fun (*this, &FilmEditor::edit_filters_clicked));
+       _scaler.signal_changed().connect (sigc::mem_fun (*this, &FilmEditor::scaler_changed));
+       _dcp_content_type.signal_changed().connect (sigc::mem_fun (*this, &FilmEditor::dcp_content_type_changed));
+       _dcp_ab.signal_toggled().connect (sigc::mem_fun (*this, &FilmEditor::dcp_ab_toggled));
+       _audio_gain.signal_value_changed().connect (sigc::mem_fun (*this, &FilmEditor::audio_gain_changed));
+       _audio_delay.signal_value_changed().connect (sigc::mem_fun (*this, &FilmEditor::audio_delay_changed));
+       _still_duration.signal_value_changed().connect (sigc::mem_fun (*this, &FilmEditor::still_duration_changed));
+       _change_dcp_range_button.signal_clicked().connect (sigc::mem_fun (*this, &FilmEditor::change_dcp_range_clicked));
+
+       /* Set up the table */
+
+       Table* t = manage (new Table);
+       
+       t->set_row_spacings (4);
+       t->set_col_spacings (12);
+       
+       int n = 0;
+       t->attach (left_aligned_label ("Name"), 0, 1, n, n + 1);
+       t->attach (_name, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Content"), 0, 1, n, n + 1);
+       t->attach (_content, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Content Type"), 0, 1, n, n + 1);
+       t->attach (_dcp_content_type, 1, 2, n, n + 1);
+       ++n;
+       t->attach (video_widget (left_aligned_label ("Frames Per Second")), 0, 1, n, n + 1);
+       t->attach (video_widget (_frames_per_second), 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Format"), 0, 1, n, n + 1);
+       t->attach (_format, 1, 2, n, n + 1);
+       ++n;
+       t->attach (left_aligned_label ("Crop"), 0, 1, n, n + 1);
+       HBox* c = manage (new HBox);
+       c->set_spacing (4);
+       c->pack_start (left_aligned_label ("L"), false, false);
+       c->pack_start (_left_crop, true, true);
+       c->pack_start (left_aligned_label ("R"), false, false);
+       c->pack_start (_right_crop, true, true);
+       c->pack_start (left_aligned_label ("T"), false, false);
+       c->pack_start (_top_crop, true, true);
+       c->pack_start (left_aligned_label ("B"), false, false);
+       c->pack_start (_bottom_crop, true, true);
+       t->attach (*c, 1, 2, n, n + 1);
+       ++n;
+
+       /* VIDEO-only stuff */
+       int const special = n;
+       t->attach (video_widget (left_aligned_label ("Filters")), 0, 1, n, n + 1);
+       HBox* fb = manage (new HBox);
+       fb->set_spacing (4);
+       fb->pack_start (video_widget (_filters), true, true);
+       fb->pack_start (video_widget (_filters_button), false, false);
+       t->attach (*fb, 1, 2, n, n + 1);
+       ++n;
+       t->attach (video_widget (left_aligned_label ("Scaler")), 0, 1, n, n + 1);
+       t->attach (video_widget (_scaler), 1, 2, n, n + 1);
+       ++n;
+       t->attach (video_widget (left_aligned_label ("Audio Gain")), 0, 1, n, n + 1);
+       t->attach (video_widget (_audio_gain), 1, 2, n, n + 1);
+       t->attach (video_widget (left_aligned_label ("dB")), 2, 3, n, n + 1);
+       ++n;
+       t->attach (video_widget (left_aligned_label ("Audio Delay")), 0, 1, n, n + 1);
+       t->attach (video_widget (_audio_delay), 1, 2, n, n + 1);
+       t->attach (video_widget (left_aligned_label ("ms")), 2, 3, n, n + 1);
+       ++n;
+       t->attach (video_widget (left_aligned_label ("Original Size")), 0, 1, n, n + 1);
+       t->attach (video_widget (_original_size), 1, 2, n, n + 1);
+       ++n;
+       t->attach (video_widget (left_aligned_label ("Length")), 0, 1, n, n + 1);
+       t->attach (video_widget (_length), 1, 2, n, n + 1);
+       ++n;
+       t->attach (video_widget (left_aligned_label ("Audio")), 0, 1, n, n + 1);
+       t->attach (video_widget (_audio), 1, 2, n, n + 1);
+       ++n;
+       t->attach (video_widget (left_aligned_label ("Range")), 0, 1, n, n + 1);
+       Gtk::HBox* db = manage (new Gtk::HBox);
+       db->pack_start (_dcp_range, true, true);
+       db->pack_start (_change_dcp_range_button, false, false);
+       t->attach (*db, 1, 2, n, n + 1);
+       ++n;
+       t->attach (_dcp_ab, 0, 3, n, n + 1);
+
+       /* STILL-only stuff */
+       n = special;
+       t->attach (still_widget (left_aligned_label ("Duration")), 0, 1, n, n + 1);
+       t->attach (still_widget (_still_duration), 1, 2, n, n + 1);
+       t->attach (still_widget (left_aligned_label ("s")), 2, 3, n, n + 1);
+       ++n;
+
+       t->show_all ();
+       _vbox.pack_start (*t, false, false);
+}
+
+/** @return Our main widget, which contains everything else */
+Widget&
+FilmEditor::widget ()
+{
+       return _vbox;
+}
+
+/** Called when the left crop widget has been changed */
+void
+FilmEditor::left_crop_changed ()
+{
+       if (_film) {
+               _film->set_left_crop (_left_crop.get_value ());
+       }
+}
+
+/** Called when the right crop widget has been changed */
+void
+FilmEditor::right_crop_changed ()
+{
+       if (_film) {
+               _film->set_right_crop (_right_crop.get_value ());
+       }
+}
+
+/** Called when the top crop widget has been changed */
+void
+FilmEditor::top_crop_changed ()
+{
+       if (_film) {
+               _film->set_top_crop (_top_crop.get_value ());
+       }
+}
+
+/** Called when the bottom crop value has been changed */
+void
+FilmEditor::bottom_crop_changed ()
+{
+       if (_film) {
+               _film->set_bottom_crop (_bottom_crop.get_value ());
+       }
+}
+
+/** Called when the content filename has been changed */
+void
+FilmEditor::content_changed ()
+{
+       if (!_film) {
+               return;
+       }
+
+       try {
+               _film->set_content (_content.get_filename ());
+       } catch (std::exception& e) {
+               _content.set_filename (_film->directory ());
+               stringstream m;
+               m << "Could not set content: " << e.what() << ".";
+               Gtk::MessageDialog d (m.str(), false, MESSAGE_ERROR);
+               d.set_title ("DVD-o-matic");
+               d.run ();
+       }
+}
+
+/** Called when the DCP A/B switch has been toggled */
+void
+FilmEditor::dcp_ab_toggled ()
+{
+       if (_film) {
+               _film->set_dcp_ab (_dcp_ab.get_active ());
+       }
+}
+
+/** Called when the name widget has been changed */
+void
+FilmEditor::name_changed ()
+{
+       if (_film) {
+               _film->set_name (_name.get_text ());
+       }
+}
+
+/** Called when the metadata stored in the Film object has changed;
+ *  so that we can update the GUI.
+ *  @param p Property of the Film that has changed.
+ */
+void
+FilmEditor::film_changed (Film::Property p)
+{
+       if (!_film) {
+               return;
+       }
+       
+       stringstream s;
+               
+       switch (p) {
+       case Film::CONTENT:
+               _content.set_filename (_film->content ());
+               setup_visibility ();
+               break;
+       case Film::FORMAT:
+               _format.set_active (Format::as_index (_film->format ()));
+               break;
+       case Film::LEFT_CROP:
+               _left_crop.set_value (_film->left_crop ());
+               break;
+       case Film::RIGHT_CROP:
+               _right_crop.set_value (_film->right_crop ());
+               break;
+       case Film::TOP_CROP:
+               _top_crop.set_value (_film->top_crop ());
+               break;
+       case Film::BOTTOM_CROP:
+               _bottom_crop.set_value (_film->bottom_crop ());
+               break;
+       case Film::FILTERS:
+       {
+               pair<string, string> p = Filter::ffmpeg_strings (_film->filters ());
+               _filters.set_text (p.first + " " + p.second);
+               break;
+       }
+       case Film::NAME:
+               _name.set_text (_film->name ());
+               break;
+       case Film::FRAMES_PER_SECOND:
+               _frames_per_second.set_value (_film->frames_per_second ());
+               break;
+       case Film::AUDIO_CHANNELS:
+       case Film::AUDIO_SAMPLE_RATE:
+               s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz";
+               _audio.set_text (s.str ());
+               break;
+       case Film::SIZE:
+               s << _film->size().width << " x " << _film->size().height;
+               _original_size.set_text (s.str ());
+               break;
+       case Film::LENGTH:
+               if (_film->frames_per_second() > 0) {
+                       s << _film->length() << " frames; " << seconds_to_hms (_film->length() / _film->frames_per_second());
+               } else {
+                       s << _film->length() << " frames";
+               }
+               _length.set_text (s.str ());
+               break;
+       case Film::DCP_CONTENT_TYPE:
+               _dcp_content_type.set_active (DCPContentType::as_index (_film->dcp_content_type ()));
+               break;
+       case Film::THUMBS:
+               break;
+       case Film::DCP_FRAMES:
+               if (_film->dcp_frames() == 0) {
+                       _dcp_range.set_text ("Whole film");
+               } else {
+                       stringstream s;
+                       s << "First " << _film->dcp_frames() << " frames";
+                       _dcp_range.set_text (s.str ());
+               }
+               break;
+       case Film::DCP_TRIM_ACTION:
+               break;
+       case Film::DCP_AB:
+               _dcp_ab.set_active (_film->dcp_ab ());
+               break;
+       case Film::SCALER:
+               _scaler.set_active (Scaler::as_index (_film->scaler ()));
+               break;
+       case Film::AUDIO_GAIN:
+               _audio_gain.set_value (_film->audio_gain ());
+               break;
+       case Film::AUDIO_DELAY:
+               _audio_delay.set_value (_film->audio_delay ());
+               break;
+       case Film::STILL_DURATION:
+               _still_duration.set_value (_film->still_duration ());
+               break;
+       }
+}
+
+/** Called when the format widget has been changed */
+void
+FilmEditor::format_changed ()
+{
+       if (_film) {
+               int const n = _format.get_active_row_number ();
+               if (n >= 0) {
+                       _film->set_format (Format::from_index (n));
+               }
+       }
+}
+
+/** Called when the DCP content type widget has been changed */
+void
+FilmEditor::dcp_content_type_changed ()
+{
+       if (_film) {
+               int const n = _dcp_content_type.get_active_row_number ();
+               if (n >= 0) {
+                       _film->set_dcp_content_type (DCPContentType::from_index (n));
+               }
+       }
+}
+
+/** Sets the Film that we are editing */
+void
+FilmEditor::set_film (Film* f)
+{
+       _film = f;
+
+       set_things_sensitive (_film != 0);
+
+       if (_film) {
+               _film->Changed.connect (sigc::mem_fun (*this, &FilmEditor::film_changed));
+       }
+
+       if (_film) {
+               FileChanged (_film->directory ());
+       } else {
+               FileChanged ("");
+       }
+       
+       film_changed (Film::NAME);
+       film_changed (Film::CONTENT);
+       film_changed (Film::DCP_CONTENT_TYPE);
+       film_changed (Film::FORMAT);
+       film_changed (Film::LEFT_CROP);
+       film_changed (Film::RIGHT_CROP);
+       film_changed (Film::TOP_CROP);
+       film_changed (Film::BOTTOM_CROP);
+       film_changed (Film::FILTERS);
+       film_changed (Film::DCP_FRAMES);
+       film_changed (Film::DCP_TRIM_ACTION);
+       film_changed (Film::DCP_AB);
+       film_changed (Film::SIZE);
+       film_changed (Film::LENGTH);
+       film_changed (Film::FRAMES_PER_SECOND);
+       film_changed (Film::AUDIO_CHANNELS);
+       film_changed (Film::AUDIO_SAMPLE_RATE);
+       film_changed (Film::SCALER);
+       film_changed (Film::AUDIO_GAIN);
+       film_changed (Film::AUDIO_DELAY);
+       film_changed (Film::STILL_DURATION);
+}
+
+/** Updates the sensitivity of lots of widgets to a given value.
+ *  @param s true to make sensitive, false to make insensitive.
+ */
+void
+FilmEditor::set_things_sensitive (bool s)
+{
+       _name.set_sensitive (s);
+       _frames_per_second.set_sensitive (s);
+       _format.set_sensitive (s);
+       _content.set_sensitive (s);
+       _left_crop.set_sensitive (s);
+       _right_crop.set_sensitive (s);
+       _top_crop.set_sensitive (s);
+       _bottom_crop.set_sensitive (s);
+       _filters_button.set_sensitive (s);
+       _scaler.set_sensitive (s);
+       _dcp_content_type.set_sensitive (s);
+       _dcp_range.set_sensitive (s);
+       _change_dcp_range_button.set_sensitive (s);
+       _dcp_ab.set_sensitive (s);
+       _audio_gain.set_sensitive (s);
+       _audio_delay.set_sensitive (s);
+       _still_duration.set_sensitive (s);
+}
+
+/** Called when the `Edit filters' button has been clicked */
+void
+FilmEditor::edit_filters_clicked ()
+{
+       FilterDialog d (_film->filters ());
+       d.ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters));
+       d.run ();
+}
+
+/** Called when the scaler widget has been changed */
+void
+FilmEditor::scaler_changed ()
+{
+       if (_film) {
+               int const n = _scaler.get_active_row_number ();
+               if (n >= 0) {
+                       _film->set_scaler (Scaler::from_index (n));
+               }
+       }
+}
+
+/** Called when the frames per second widget has been changed */
+void
+FilmEditor::frames_per_second_changed ()
+{
+       if (_film) {
+               _film->set_frames_per_second (_frames_per_second.get_value ());
+       }
+}
+
+void
+FilmEditor::audio_gain_changed ()
+{
+       if (_film) {
+               _film->set_audio_gain (_audio_gain.get_value ());
+       }
+}
+
+void
+FilmEditor::audio_delay_changed ()
+{
+       if (_film) {
+               _film->set_audio_delay (_audio_delay.get_value ());
+       }
+}
+
+Widget&
+FilmEditor::video_widget (Widget& w)
+{
+       _video_widgets.push_back (&w);
+       return w;
+}
+
+Widget&
+FilmEditor::still_widget (Widget& w)
+{
+       _still_widgets.push_back (&w);
+       return w;
+}
+
+void
+FilmEditor::setup_visibility ()
+{
+       if (!_film) {
+               return;
+       }
+                       
+       ContentType const c = _film->content_type ();
+
+       for (list<Widget *>::iterator i = _video_widgets.begin(); i != _video_widgets.end(); ++i) {
+               (*i)->property_visible() = (c == VIDEO);
+       }
+
+       for (list<Widget *>::iterator i = _still_widgets.begin(); i != _still_widgets.end(); ++i) {
+               (*i)->property_visible() = (c == STILL);
+       }
+}
+
+void
+FilmEditor::still_duration_changed ()
+{
+       if (_film) {
+               _film->set_still_duration (_still_duration.get_value ());
+       }
+}
+
+void
+FilmEditor::change_dcp_range_clicked ()
+{
+       DCPRangeDialog d (_film);
+       d.Changed.connect (sigc::mem_fun (*this, &FilmEditor::dcp_range_changed));
+       d.run ();
+}
+
+void
+FilmEditor::dcp_range_changed (int frames, TrimAction action)
+{
+       _film->set_dcp_frames (frames);
+       _film->set_dcp_trim_action (action);
+}

diff --git a/src/gtk/film_editor.h b/src/gtk/film_editor.h
new file mode 100644 (file)
index 0000000..9d15b43
--- /dev/null
+++ b/src/gtk/film_editor.h
@@ -0,0 +1,125 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/film_editor.h
+ *  @brief A GTK widget to edit a film's metadata, and perform various functions.
+ */
+
+#include <gtkmm.h>
+
+class Film;
+
+/** @class FilmEditor
+ *  @brief A GTK widget to edit a film's metadata, and perform various functions.
+ */
+class FilmEditor
+{
+public:
+       FilmEditor (Film *);
+
+       Gtk::Widget& widget ();
+
+       void set_film (Film *);
+       void setup_visibility ();
+
+       sigc::signal1<void, std::string> FileChanged;
+
+private:
+       /* Handle changes to the view */
+       void name_changed ();
+       void left_crop_changed ();
+       void right_crop_changed ();
+       void top_crop_changed ();
+       void bottom_crop_changed ();
+       void content_changed ();
+       void frames_per_second_changed ();
+       void format_changed ();
+       void dcp_range_changed (int, TrimAction);
+       void dcp_content_type_changed ();
+       void dcp_ab_toggled ();
+       void scaler_changed ();
+       void audio_gain_changed ();
+       void audio_delay_changed ();
+       void still_duration_changed ();
+
+       /* Handle changes to the model */
+       void film_changed (Film::Property);
+
+       /* Button clicks */
+       void edit_filters_clicked ();
+       void change_dcp_range_clicked ();
+
+       void set_things_sensitive (bool);
+
+       Gtk::Widget & video_widget (Gtk::Widget &);
+       Gtk::Widget & still_widget (Gtk::Widget &);
+
+       /** The film we are editing */
+       Film* _film;
+       /** The overall VBox containing our widget */
+       Gtk::VBox _vbox;
+       /** The Film's name */
+       Gtk::Entry _name;
+       /** The Film's frames per second */
+       Gtk::SpinButton _frames_per_second;
+       /** The Film's format */
+       Gtk::ComboBoxText _format;
+       /** The Film's content file */
+       Gtk::FileChooserButton _content;
+       /** The Film's left crop */
+       Gtk::SpinButton _left_crop;
+       /** The Film's right crop */
+       Gtk::SpinButton _right_crop;
+       /** The Film's top crop */
+       Gtk::SpinButton _top_crop;
+       /** The Film's bottom crop */
+       Gtk::SpinButton _bottom_crop;
+       /** Currently-applied filters */
+       Gtk::Label _filters;
+       /** Button to open the filters dialogue */
+       Gtk::Button _filters_button;
+       /** The Film's scaler */
+       Gtk::ComboBoxText _scaler;
+       /** The Film's audio gain */
+       Gtk::SpinButton _audio_gain;
+       /** The Film's audio delay */
+       Gtk::SpinButton _audio_delay;
+       /** The Film's DCP content type */
+       Gtk::ComboBoxText _dcp_content_type;
+       /** The Film's original size */
+       Gtk::Label _original_size;
+       /** The Film's length */
+       Gtk::Label _length;
+       /** The Film's audio details */
+       Gtk::Label _audio;
+       /** The Film's duration for still sources */
+       Gtk::SpinButton _still_duration;
+
+       /** Button to start making a DCP from existing J2K and WAV files */
+       Gtk::Button _make_dcp_from_existing_button;
+       /** Display of the range of frames that will be used */
+       Gtk::Label _dcp_range;
+       /** Button to change the range */
+       Gtk::Button _change_dcp_range_button;
+       /** Selector to generate an A/B comparison DCP */
+       Gtk::CheckButton _dcp_ab;
+
+       std::list<Gtk::Widget*> _video_widgets;
+       std::list<Gtk::Widget*> _still_widgets;
+};

diff --git a/src/gtk/film_list.cc b/src/gtk/film_list.cc
new file mode 100644 (file)
index 0000000..1a98544
--- /dev/null
+++ b/src/gtk/film_list.cc
@@ -0,0 +1,65 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/filesystem.hpp>
+#include "lib/film.h"
+#include "film_list.h"
+
+using namespace std;
+using namespace boost;
+
+FilmList::FilmList (string d)
+       : _directory (d)
+       , _list (1)
+{
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (_directory); i != filesystem::directory_iterator(); ++i) {
+               if (is_directory (*i)) {
+                       filesystem::path m = filesystem::path (*i) / filesystem::path ("metadata");
+                       if (is_regular_file (m)) {
+                               Film* f = new Film (i->path().string());
+                               _films.push_back (f);
+                       }
+               }
+       }
+
+       for (vector<Film const *>::iterator i = _films.begin(); i != _films.end(); ++i) {
+               _list.append_text ((*i)->name ());
+       }
+
+       _list.set_headers_visible (false);
+       _list.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &FilmList::selection_changed));
+}
+
+Gtk::Widget&
+FilmList::widget ()
+{
+       return _list;
+}
+
+void
+FilmList::selection_changed ()
+{
+       Gtk::ListViewText::SelectionList s = _list.get_selected ();
+       if (s.empty ()) {
+               return;
+       }
+
+       assert (s[0] < int (_films.size ()));
+       SelectionChanged (_films[s[0]]);
+}

diff --git a/src/gtk/film_list.h b/src/gtk/film_list.h
new file mode 100644 (file)
index 0000000..5a4ac3c
--- /dev/null
+++ b/src/gtk/film_list.h
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <string>
+#include <vector>
+#include <gtkmm.h>
+
+class Film;
+
+class FilmList
+{
+public:
+       FilmList (std::string);
+       
+       Gtk::Widget& widget ();
+
+       sigc::signal<void, Film const *> SelectionChanged;
+
+private:
+       void selection_changed ();
+
+       std::string _directory;
+       std::vector<Film const *> _films;
+       Gtk::ListViewText _list;
+};

diff --git a/src/gtk/film_player.cc b/src/gtk/film_player.cc
new file mode 100644 (file)
index 0000000..63e6e49
--- /dev/null
+++ b/src/gtk/film_player.cc
@@ -0,0 +1,310 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "lib/screen.h"
+#include "lib/config.h"
+#include "lib/player_manager.h"
+#include "lib/film.h"
+#include "film_player.h"
+#include "gtk_util.h"
+
+using namespace std;
+using namespace boost;
+
+FilmPlayer::FilmPlayer (Film const * f)
+       : _play ("Play")
+       , _pause ("Pause")
+       , _stop ("Stop")
+       , _ab ("A/B")
+       , _ignore_position_changed (false)
+{
+       set_film (f);
+
+       vector<shared_ptr<Screen> > const scr = Config::instance()->screens ();
+       for (vector<shared_ptr<Screen> >::const_iterator i = scr.begin(); i != scr.end(); ++i) {
+               _screen.append_text ((*i)->name ());
+       }
+       
+       if (!scr.empty ()) {
+               _screen.set_active (0);
+       }
+
+       _status.set_use_markup (true);
+
+       _position.set_digits (0);
+
+       _main_vbox.set_spacing (12);
+
+       Gtk::HBox* l = manage (new Gtk::HBox);
+       l->pack_start (_play);
+       l->pack_start (_pause);
+       l->pack_start (_stop);
+
+       Gtk::VBox* r = manage (new Gtk::VBox);
+       r->pack_start (_screen, false, false);
+       r->pack_start (_ab, false, false);
+       r->pack_start (*manage (new Gtk::Label ("")), true, true);
+
+       Gtk::HBox* t = manage (new Gtk::HBox);
+       t->pack_start (*l, true, true);
+       t->pack_start (*r, false, false);
+
+       _main_vbox.pack_start (*t, true, true);
+       _main_vbox.pack_start (_position, false, false);
+       _main_vbox.pack_start (_status, false, false);
+
+       _play.signal_clicked().connect (sigc::mem_fun (*this, &FilmPlayer::play_clicked));
+       _pause.signal_clicked().connect (sigc::mem_fun (*this, &FilmPlayer::pause_clicked));
+       _stop.signal_clicked().connect (sigc::mem_fun (*this, &FilmPlayer::stop_clicked));
+       _position.signal_value_changed().connect (sigc::mem_fun (*this, &FilmPlayer::position_changed));
+       _position.signal_format_value().connect (sigc::mem_fun (*this, &FilmPlayer::format_position));
+
+       set_button_states ();
+       Glib::signal_timeout().connect (sigc::bind_return (sigc::mem_fun (*this, &FilmPlayer::update), true), 1000);
+
+       Config::instance()->Changed.connect (sigc::mem_fun (*this, &FilmPlayer::update_screens));
+}
+
+void
+FilmPlayer::set_film (Film const * f)
+{
+       _film = f;
+
+       if (_film && _film->length() != 0 && _film->frames_per_second() != 0) {
+               _position.set_range (0, _film->length() / _film->frames_per_second());
+       }
+
+       if (_film) {
+               _film->Changed.connect (sigc::mem_fun (*this, &FilmPlayer::film_changed));
+       }
+}
+
+Gtk::Widget &
+FilmPlayer::widget ()
+{
+       return _main_vbox;
+}
+
+void
+FilmPlayer::set_button_states ()
+{
+       if (_film == 0) {
+               _play.set_sensitive (false);
+               _pause.set_sensitive (false);
+               _stop.set_sensitive (false);
+               _screen.set_sensitive (false);
+               _position.set_sensitive (false);
+               _ab.set_sensitive (false);
+               return;
+       }
+       
+       PlayerManager::State s = PlayerManager::instance()->state ();
+
+       switch (s) {
+       case PlayerManager::QUIESCENT:
+               _play.set_sensitive (true);
+               _pause.set_sensitive (false);
+               _stop.set_sensitive (false);
+               _screen.set_sensitive (true);
+               _position.set_sensitive (false);
+               _ab.set_sensitive (true);
+               break;
+       case PlayerManager::PLAYING:
+               _play.set_sensitive (false);
+               _pause.set_sensitive (true);
+               _stop.set_sensitive (true);
+               _screen.set_sensitive (false);
+               _position.set_sensitive (true);
+               _ab.set_sensitive (false);
+               break;
+       case PlayerManager::PAUSED:
+               _play.set_sensitive (true);
+               _pause.set_sensitive (false);
+               _stop.set_sensitive (true);
+               _screen.set_sensitive (false);
+               _position.set_sensitive (false);
+               _ab.set_sensitive (false);
+               break;
+       }
+}
+
+void
+FilmPlayer::play_clicked ()
+{
+       PlayerManager* p = PlayerManager::instance ();
+
+       switch (p->state ()) {
+       case PlayerManager::QUIESCENT:
+               _last_play_fs = _film->state_copy ();
+               if (_ab.get_active ()) {
+                       shared_ptr<FilmState> fs_a = _film->state_copy ();
+                       fs_a->filters.clear ();
+                       /* This is somewhat arbitrary, but hey ho */
+                       fs_a->scaler = Scaler::from_id ("bicubic");
+                       p->setup (fs_a, _last_play_fs, screen ());
+               } else {
+                       p->setup (_last_play_fs, screen ());
+               }
+               p->pause_or_unpause ();
+               break;
+       case PlayerManager::PLAYING:
+               break;
+       case PlayerManager::PAUSED:
+               p->pause_or_unpause ();
+               break;
+       }
+}
+
+void
+FilmPlayer::pause_clicked ()
+{
+       PlayerManager* p = PlayerManager::instance ();
+
+       switch (p->state ()) {
+       case PlayerManager::QUIESCENT:
+               break;
+       case PlayerManager::PLAYING:
+               p->pause_or_unpause ();
+               break;
+       case PlayerManager::PAUSED:
+               break;
+       }
+}
+
+void
+FilmPlayer::stop_clicked ()
+{
+       PlayerManager::instance()->stop ();
+}
+
+shared_ptr<Screen>
+FilmPlayer::screen () const
+{
+       vector<shared_ptr<Screen> > const s = Config::instance()->screens ();
+       if (s.empty ()) {
+               return shared_ptr<Screen> ();
+       }
+                        
+       int const r = _screen.get_active_row_number ();
+       if (r >= int (s.size ())) {
+               return s[0];
+       }
+       
+       return s[r];
+}
+
+void
+FilmPlayer::update ()
+{
+       set_button_states ();
+       set_status ();
+}
+
+void
+FilmPlayer::set_status ()
+{
+       PlayerManager::State s = PlayerManager::instance()->state ();
+
+       stringstream m;
+       switch (s) {
+       case PlayerManager::QUIESCENT:
+               m << "Idle";
+               break;
+       case PlayerManager::PLAYING:
+               m << "<span foreground=\"red\" weight=\"bold\">PLAYING</span>";
+               break;
+       case PlayerManager::PAUSED:
+               m << "<b>Paused</b>";
+               break;
+       }
+
+       _ignore_position_changed = true;
+       
+       if (s != PlayerManager::QUIESCENT) {
+               float const p = PlayerManager::instance()->position ();
+               if (_last_play_fs->frames_per_second != 0 && _last_play_fs->length != 0) {
+                       m << " <i>(" << seconds_to_hms (_last_play_fs->length / _last_play_fs->frames_per_second - p) << " remaining)</i>";
+               }
+
+               _position.set_value (p);
+       } else {
+               _position.set_value (0);
+       }
+
+       _ignore_position_changed = false;
+       
+       _status.set_markup (m.str ());
+}
+
+void
+FilmPlayer::position_changed ()
+{
+       if (_ignore_position_changed) {
+               return;
+       }
+
+       PlayerManager::instance()->set_position (_position.get_value ());
+}
+
+string
+FilmPlayer::format_position (double v)
+{
+       return seconds_to_hms (v);
+}
+
+void
+FilmPlayer::update_screens ()
+{
+       string const c = _screen.get_active_text ();
+       
+       _screen.clear ();
+       
+       vector<shared_ptr<Screen> > const scr = Config::instance()->screens ();
+       bool have_last_active_text = false;
+       for (vector<shared_ptr<Screen> >::const_iterator i = scr.begin(); i != scr.end(); ++i) {
+               _screen.append_text ((*i)->name ());
+               if ((*i)->name() == c) {
+                       have_last_active_text = true;
+               }
+       }
+
+       if (have_last_active_text) {
+               _screen.set_active_text (c);
+       } else if (!scr.empty ()) {
+               _screen.set_active (0);
+       }
+}
+
+void
+FilmPlayer::film_changed (Film::Property p)
+{
+       if (p == Film::CONTENT) {
+               setup_visibility ();
+       }
+}
+
+void
+FilmPlayer::setup_visibility ()
+{
+       if (!_film) {
+               return;
+       }
+       
+       widget().property_visible() = (_film->content_type() == VIDEO);
+}

diff --git a/src/gtk/film_player.h b/src/gtk/film_player.h
new file mode 100644 (file)
index 0000000..bb60eeb
--- /dev/null
+++ b/src/gtk/film_player.h
@@ -0,0 +1,63 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <gtkmm.h>
+#include "lib/film.h"
+
+class Film;
+class Screen;
+class FilmState;
+
+class FilmPlayer
+{
+public:
+       FilmPlayer (Film const * f = 0);
+       
+       Gtk::Widget& widget ();
+       
+       void set_film (Film const *);
+       void setup_visibility ();
+
+private:
+       void play_clicked ();
+       void pause_clicked ();
+       void stop_clicked ();
+       void position_changed ();
+       std::string format_position (double);
+       void film_changed (Film::Property);
+       
+       void set_button_states ();
+       boost::shared_ptr<Screen> screen () const;
+       void set_status ();
+       void update ();
+       void update_screens ();
+       
+       Film const * _film;
+       boost::shared_ptr<const FilmState> _last_play_fs;
+
+       Gtk::VBox _main_vbox;
+       Gtk::Button _play;
+       Gtk::Button _pause;
+       Gtk::Button _stop;
+       Gtk::Label _status;
+       Gtk::CheckButton _ab;
+       Gtk::ComboBoxText _screen;
+       Gtk::HScale _position;
+       bool _ignore_position_changed;
+};

diff --git a/src/gtk/film_viewer.cc b/src/gtk/film_viewer.cc
new file mode 100644 (file)
index 0000000..0408d50
--- /dev/null
+++ b/src/gtk/film_viewer.cc
@@ -0,0 +1,224 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/film_viewer.cc
+ *  @brief A GTK widget to view `thumbnails' of a Film.
+ */
+
+#include <iostream>
+#include <iomanip>
+#include "lib/film.h"
+#include "lib/format.h"
+#include "lib/util.h"
+#include "lib/thumbs_job.h"
+#include "lib/job_manager.h"
+#include "lib/film_state.h"
+#include "lib/options.h"
+#include "film_viewer.h"
+
+using namespace std;
+using namespace boost;
+
+FilmViewer::FilmViewer (Film* f)
+       : _film (f)
+       , _update_button ("Update")
+{
+       _scroller.add (_image);
+
+       Gtk::HBox* controls = manage (new Gtk::HBox);
+       controls->set_spacing (6);
+       controls->pack_start (_update_button, false, false);
+       controls->pack_start (_position_slider);
+       
+       _vbox.pack_start (_scroller, true, true);
+       _vbox.pack_start (*controls, false, false);
+       _vbox.set_border_width (12);
+
+       _update_button.signal_clicked().connect (sigc::mem_fun (*this, &FilmViewer::update_thumbs));
+
+       _position_slider.set_digits (0);
+       _position_slider.signal_format_value().connect (sigc::mem_fun (*this, &FilmViewer::format_position_slider_value));
+       _position_slider.signal_value_changed().connect (sigc::mem_fun (*this, &FilmViewer::position_slider_changed));
+
+       _scroller.signal_size_allocate().connect (sigc::mem_fun (*this, &FilmViewer::scroller_size_allocate));
+
+       set_film (_film);
+}
+
+void
+FilmViewer::load_thumbnail (int n)
+{
+       if (_film == 0 || _film->num_thumbs() <= n) {
+               return;
+       }
+
+       int const left = _film->left_crop ();
+       int const right = _film->right_crop ();
+       int const top = _film->top_crop ();
+       int const bottom = _film->bottom_crop ();
+
+       _pixbuf = Gdk::Pixbuf::create_from_file (_film->thumb_file (n));
+
+       int const cw = _film->size().width - left - right;
+       int const ch = _film->size().height - top - bottom;
+       _cropped_pixbuf = Gdk::Pixbuf::create_subpixbuf (_pixbuf, left, top, cw, ch);
+       update_scaled_pixbuf ();
+       _image.set (_scaled_pixbuf);
+}
+
+void
+FilmViewer::reload_current_thumbnail ()
+{
+       load_thumbnail (_position_slider.get_value ());
+}
+
+void
+FilmViewer::position_slider_changed ()
+{
+       reload_current_thumbnail ();
+}
+
+string
+FilmViewer::format_position_slider_value (double v) const
+{
+       stringstream s;
+
+       if (_film && int (v) < _film->num_thumbs ()) {
+               int const f = _film->thumb_frame (int (v));
+               s << f << " " << seconds_to_hms (f / _film->frames_per_second ());
+       } else {
+               s << "-";
+       }
+       
+       return s.str ();
+}
+
+void
+FilmViewer::film_changed (Film::Property p)
+{
+       if (p == Film::LEFT_CROP || p == Film::RIGHT_CROP || p == Film::TOP_CROP || p == Film::BOTTOM_CROP) {
+               reload_current_thumbnail ();
+       } else if (p == Film::THUMBS) {
+               if (_film && _film->num_thumbs() > 1) {
+                       _position_slider.set_range (0, _film->num_thumbs () - 1);
+               } else {
+                       _image.clear ();
+                       _position_slider.set_range (0, 1);
+               }
+               
+               _position_slider.set_value (0);
+               reload_current_thumbnail ();
+       } else if (p == Film::FORMAT) {
+               reload_current_thumbnail ();
+       } else if (p == Film::CONTENT) {
+               setup_visibility ();
+               update_thumbs ();
+       }
+}
+
+void
+FilmViewer::set_film (Film* f)
+{
+       _film = f;
+
+       _update_button.set_sensitive (_film != 0);
+       
+       if (!_film) {
+               _image.clear ();
+               return;
+       }
+
+       _film->Changed.connect (sigc::mem_fun (*this, &FilmViewer::film_changed));
+
+       film_changed (Film::THUMBS);
+}
+
+pair<int, int>
+FilmViewer::scaled_pixbuf_size () const
+{
+       if (_film == 0) {
+               return make_pair (0, 0);
+       }
+       
+       int const cw = _film->size().width - _film->left_crop() - _film->right_crop(); 
+       int const ch = _film->size().height - _film->top_crop() - _film->bottom_crop();
+
+       float ratio = 1;
+       if (_film->format()) {
+               ratio = _film->format()->ratio_as_float() * ch / cw;
+       }
+
+       Gtk::Allocation const a = _scroller.get_allocation ();
+       float const zoom = min (float (a.get_width()) / (cw * ratio), float (a.get_height()) / cw);
+       return make_pair (cw * zoom * ratio, ch * zoom);
+}
+       
+void
+FilmViewer::update_scaled_pixbuf ()
+{
+       pair<int, int> const s = scaled_pixbuf_size ();
+
+       if (s.first > 0 && s.second > 0 && _cropped_pixbuf) {
+               _scaled_pixbuf = _cropped_pixbuf->scale_simple (s.first, s.second, Gdk::INTERP_HYPER);
+               _image.set (_scaled_pixbuf);
+       }
+}
+
+void
+FilmViewer::update_thumbs ()
+{
+       if (!_film) {
+               return;
+       }
+
+       _film->update_thumbs_pre_gui ();
+
+       shared_ptr<const FilmState> s = _film->state_copy ();
+       shared_ptr<Options> o (new Options (s->dir ("thumbs"), ".tiff", ""));
+       o->out_size = _film->size ();
+       o->apply_crop = false;
+       o->decode_audio = false;
+       o->decode_video_frequency = 128;
+       
+       shared_ptr<Job> j (new ThumbsJob (s, o, _film->log ()));
+       j->Finished.connect (sigc::mem_fun (_film, &Film::update_thumbs_post_gui));
+       JobManager::instance()->add (j);
+}
+
+void
+FilmViewer::scroller_size_allocate (Gtk::Allocation a)
+{
+       if (a.get_width() != _last_scroller_allocation.get_width() || a.get_height() != _last_scroller_allocation.get_height()) {
+               update_scaled_pixbuf ();
+       }
+       
+       _last_scroller_allocation = a;
+}
+
+void
+FilmViewer::setup_visibility ()
+{
+       if (!_film) {
+               return;
+       }
+
+       ContentType const c = _film->content_type ();
+       _update_button.property_visible() = (c == VIDEO);
+       _position_slider.property_visible() = (c == VIDEO);
+}

diff --git a/src/gtk/film_viewer.h b/src/gtk/film_viewer.h
new file mode 100644 (file)
index 0000000..e01d6c0
--- /dev/null
+++ b/src/gtk/film_viewer.h
@@ -0,0 +1,63 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/film_viewer.h
+ *  @brief A GTK widget to view `thumbnails' of a Film.
+ */
+
+#include <gtkmm.h>
+#include "lib/film.h"
+
+/** @class FilmViewer
+ *  @brief A GTK widget to view `thumbnails' of a Film.
+ */
+class FilmViewer
+{
+public:
+       FilmViewer (Film *);
+
+       Gtk::Widget& widget () {
+               return _vbox;
+       }
+
+       void set_film (Film *);
+       void setup_visibility ();
+
+private:
+       void position_slider_changed ();
+       void update_thumbs ();
+       std::string format_position_slider_value (double) const;
+       void load_thumbnail (int);
+       void film_changed (Film::Property);
+       void reload_current_thumbnail ();
+       void update_scaled_pixbuf ();
+       std::pair<int, int> scaled_pixbuf_size () const;
+       void scroller_size_allocate (Gtk::Allocation);
+
+       Film* _film;
+       Gtk::VBox _vbox;
+       Gtk::ScrolledWindow _scroller;
+       Gtk::Image _image;
+       Glib::RefPtr<Gdk::Pixbuf> _pixbuf;
+       Glib::RefPtr<Gdk::Pixbuf> _cropped_pixbuf;
+       Glib::RefPtr<Gdk::Pixbuf> _scaled_pixbuf;
+       Gtk::HScale _position_slider;
+       Gtk::Button _update_button;
+       Gtk::Allocation _last_scroller_allocation;
+};

diff --git a/src/gtk/filter_dialog.cc b/src/gtk/filter_dialog.cc
new file mode 100644 (file)
index 0000000..e52efb6
--- /dev/null
+++ b/src/gtk/filter_dialog.cc
@@ -0,0 +1,47 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/filter_dialog.cc
+ *  @brief A dialog to select FFmpeg filters.
+ */
+
+#include "lib/film.h"
+#include "filter_dialog.h"
+
+using namespace std;
+
+FilterDialog::FilterDialog (vector<Filter const *> const & f)
+       : Gtk::Dialog ("Filters")
+       , _filters (f)
+{
+       get_vbox()->pack_start (_filters.widget ());
+
+       _filters.ActiveChanged.connect (sigc::mem_fun (*this, &FilterDialog::active_changed));
+
+       add_button ("Close", Gtk::RESPONSE_CLOSE);
+
+       show_all ();
+}
+       
+
+void
+FilterDialog::active_changed ()
+{
+       ActiveChanged (_filters.active ());
+}

diff --git a/src/gtk/filter_dialog.h b/src/gtk/filter_dialog.h
new file mode 100644 (file)
index 0000000..84c6e29
--- /dev/null
+++ b/src/gtk/filter_dialog.h
@@ -0,0 +1,43 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/filter_dialog.h
+ *  @brief A dialog to select FFmpeg filters.
+ */
+
+#include <gtkmm.h>
+#include "filter_view.h"
+
+class Film;
+
+/** @class FilterDialog
+ *  @brief A dialog to select FFmpeg filters.
+ */
+class FilterDialog : public Gtk::Dialog
+{
+public:
+       FilterDialog (std::vector<Filter const *> const &);
+
+       sigc::signal1<void, std::vector<Filter const *> > ActiveChanged;
+
+private:
+       void active_changed ();
+       
+       FilterView _filters;
+};

diff --git a/src/gtk/filter_view.cc b/src/gtk/filter_view.cc
new file mode 100644 (file)
index 0000000..f686c20
--- /dev/null
+++ b/src/gtk/filter_view.cc
@@ -0,0 +1,72 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/filter_view.cc
+ *  @brief A widget to select FFmpeg filters.
+ */
+
+#include <iostream>
+#include "lib/filter.h"
+#include "filter_view.h"
+
+using namespace std;
+
+FilterView::FilterView (vector<Filter const *> const & active)
+{
+       _box.set_spacing (4);
+       
+       vector<Filter const *> filters = Filter::all ();
+
+       for (vector<Filter const *>::iterator i = filters.begin(); i != filters.end(); ++i) {
+               Gtk::CheckButton* b = Gtk::manage (new Gtk::CheckButton ((*i)->name()));
+               bool const a = find (active.begin(), active.end(), *i) != active.end ();
+               b->set_active (a);
+               _filters[*i] = a;
+               b->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &FilterView::filter_toggled), *i));
+               _box.pack_start (*b, false, false);
+       }
+
+       _box.show_all ();
+}
+
+Gtk::Widget &
+FilterView::widget ()
+{
+       return _box;
+}
+
+void
+FilterView::filter_toggled (Filter const * f)
+{
+       _filters[f] = !_filters[f];
+       ActiveChanged ();
+}
+
+vector<Filter const*>
+FilterView::active () const
+{
+       vector<Filter const *> active;
+       for (map<Filter const *, bool>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
+               if (i->second) {
+                       active.push_back (i->first);
+               }
+       }
+
+       return active;
+}

diff --git a/src/gtk/filter_view.h b/src/gtk/filter_view.h
new file mode 100644 (file)
index 0000000..0c96b0e
--- /dev/null
+++ b/src/gtk/filter_view.h
@@ -0,0 +1,47 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/filter_view.h
+ *  @brief A widget to select FFmpeg filters.
+ */
+
+#include <gtkmm.h>
+#include <vector>
+
+class Filter;
+
+/** @class FilterView
+ *  @brief A widget to select FFmpeg filters.
+ */
+class FilterView
+{
+public:
+       FilterView (std::vector<Filter const *> const &);
+
+       Gtk::Widget & widget ();
+       std::vector<Filter const *> active () const;
+
+       sigc::signal0<void> ActiveChanged;
+
+private:
+       void filter_toggled (Filter const *);
+
+       Gtk::VBox _box;
+       std::map<Filter const *, bool> _filters;
+};

diff --git a/src/gtk/gpl.cc b/src/gtk/gpl.cc
new file mode 100644 (file)
index 0000000..b7bcae9
--- /dev/null
+++ b/src/gtk/gpl.cc
@@ -0,0 +1,370 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/gpl.cc
+ *  @brief The GPL.
+ */
+
+const char* gpl = "\n\
+DVD-o-matic comes with NO WARRANTY. It is free software, and you are \n\
+welcome to redistribute it under the terms of the GNU Public License,\n\
+shown below.\n                                 \
+\n\
+                   GNU GENERAL PUBLIC LICENSE\n\
+                      Version 2, June 1991\n\
+\n\
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n\
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n\
+ Everyone is permitted to copy and distribute verbatim copies\n\
+ of this license document, but changing it is not allowed.\n\
+\n\
+                           Preamble\n\
+\n\
+  The licenses for most software are designed to take away your\n\
+freedom to share and change it.  By contrast, the GNU General Public\n\
+License is intended to guarantee your freedom to share and change free\n\
+software--to make sure the software is free for all its users.  This\n\
+General Public License applies to most of the Free Software\n\
+Foundation's software and to any other program whose authors commit to\n\
+using it.  (Some other Free Software Foundation software is covered by\n\
+the GNU Library General Public License instead.)  You can apply it to\n\
+your programs, too.\n\
+\n\
+  When we speak of free software, we are referring to freedom, not\n\
+price.  Our General Public Licenses are designed to make sure that you\n\
+have the freedom to distribute copies of free software (and charge for\n\
+this service if you wish), that you receive source code or can get it\n\
+if you want it, that you can change the software or use pieces of it\n\
+in new free programs; and that you know you can do these things.\n\
+\n\
+  To protect your rights, we need to make restrictions that forbid\n\
+anyone to deny you these rights or to ask you to surrender the rights.\n\
+These restrictions translate to certain responsibilities for you if you\n\
+distribute copies of the software, or if you modify it.\n\
+\n\
+  For example, if you distribute copies of such a program, whether\n\
+gratis or for a fee, you must give the recipients all the rights that\n\
+you have.  You must make sure that they, too, receive or can get the\n\
+source code.  And you must show them these terms so they know their\n\
+rights.\n\
+\n\
+  We protect your rights with two steps: (1) copyright the software, and\n\
+(2) offer you this license which gives you legal permission to copy,\n\
+distribute and/or modify the software.\n\
+\n\
+  Also, for each author's protection and ours, we want to make certain\n\
+that everyone understands that there is no warranty for this free\n\
+software.  If the software is modified by someone else and passed on, we\n\
+want its recipients to know that what they have is not the original, so\n\
+that any problems introduced by others will not reflect on the original\n\
+authors' reputations.\n\
+\n\
+  Finally, any free program is threatened constantly by software\n\
+patents.  We wish to avoid the danger that redistributors of a free\n\
+program will individually obtain patent licenses, in effect making the\n\
+program proprietary.  To prevent this, we have made it clear that any\n\
+patent must be licensed for everyone's free use or not licensed at all.\n\
+\n\
+  The precise terms and conditions for copying, distribution and\n\
+modification follow.\n\
+\n\
+                   GNU GENERAL PUBLIC LICENSE\n\
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n\
+\n\
+  0. This License applies to any program or other work which contains\n\
+a notice placed by the copyright holder saying it may be distributed\n\
+under the terms of this General Public License.  The \"Program\", below,\n\
+refers to any such program or work, and a \"work based on the Program\"\n\
+means either the Program or any derivative work under copyright law:\n\
+that is to say, a work containing the Program or a portion of it,\n\
+either verbatim or with modifications and/or translated into another\n\
+language.  (Hereinafter, translation is included without limitation in\n\
+the term \"modification\".)  Each licensee is addressed as \"you\".\n\
+\n\
+Activities other than copying, distribution and modification are not\n\
+covered by this License; they are outside its scope.  The act of\n\
+running the Program is not restricted, and the output from the Program\n\
+is covered only if its contents constitute a work based on the\n\
+Program (independent of having been made by running the Program).\n\
+Whether that is true depends on what the Program does.\n\
+\n\
+  1. You may copy and distribute verbatim copies of the Program's\n\
+source code as you receive it, in any medium, provided that you\n\
+conspicuously and appropriately publish on each copy an appropriate\n\
+copyright notice and disclaimer of warranty; keep intact all the\n\
+notices that refer to this License and to the absence of any warranty;\n\
+and give any other recipients of the Program a copy of this License\n\
+along with the Program.\n\
+\n\
+You may charge a fee for the physical act of transferring a copy, and\n\
+you may at your option offer warranty protection in exchange for a fee.\n\
+\n\
+  2. You may modify your copy or copies of the Program or any portion\n\
+of it, thus forming a work based on the Program, and copy and\n\
+distribute such modifications or work under the terms of Section 1\n\
+above, provided that you also meet all of these conditions:\n\
+\n\
+    a) You must cause the modified files to carry prominent notices\n\
+    stating that you changed the files and the date of any change.\n\
+\n\
+    b) You must cause any work that you distribute or publish, that in\n\
+    whole or in part contains or is derived from the Program or any\n\
+    part thereof, to be licensed as a whole at no charge to all third\n\
+    parties under the terms of this License.\n\
+\n\
+    c) If the modified program normally reads commands interactively\n\
+    when run, you must cause it, when started running for such\n\
+    interactive use in the most ordinary way, to print or display an\n\
+    announcement including an appropriate copyright notice and a\n\
+    notice that there is no warranty (or else, saying that you provide\n\
+    a warranty) and that users may redistribute the program under\n\
+    these conditions, and telling the user how to view a copy of this\n\
+    License.  (Exception: if the Program itself is interactive but\n\
+    does not normally print such an announcement, your work based on\n\
+    the Program is not required to print an announcement.)\n\
+\n\
+These requirements apply to the modified work as a whole.  If\n\
+identifiable sections of that work are not derived from the Program,\n\
+and can be reasonably considered independent and separate works in\n\
+themselves, then this License, and its terms, do not apply to those\n\
+sections when you distribute them as separate works.  But when you\n\
+distribute the same sections as part of a whole which is a work based\n\
+on the Program, the distribution of the whole must be on the terms of\n\
+this License, whose permissions for other licensees extend to the\n\
+entire whole, and thus to each and every part regardless of who wrote it.\n\
+\n\
+Thus, it is not the intent of this section to claim rights or contest\n\
+your rights to work written entirely by you; rather, the intent is to\n\
+exercise the right to control the distribution of derivative or\n\
+collective works based on the Program.\n\
+\n\
+In addition, mere aggregation of another work not based on the Program\n\
+with the Program (or with a work based on the Program) on a volume of\n\
+a storage or distribution medium does not bring the other work under\n\
+the scope of this License.\n\
+\n\
+  3. You may copy and distribute the Program (or a work based on it,\n\
+under Section 2) in object code or executable form under the terms of\n\
+Sections 1 and 2 above provided that you also do one of the following:\n\
+\n\
+    a) Accompany it with the complete corresponding machine-readable\n\
+    source code, which must be distributed under the terms of Sections\n\
+    1 and 2 above on a medium customarily used for software interchange; or,\n\
+\n\
+    b) Accompany it with a written offer, valid for at least three\n\
+    years, to give any third party, for a charge no more than your\n\
+    cost of physically performing source distribution, a complete\n\
+    machine-readable copy of the corresponding source code, to be\n\
+    distributed under the terms of Sections 1 and 2 above on a medium\n\
+    customarily used for software interchange; or,\n\
+\n\
+    c) Accompany it with the information you received as to the offer\n\
+    to distribute corresponding source code.  (This alternative is\n\
+    allowed only for noncommercial distribution and only if you\n\
+    received the program in object code or executable form with such\n\
+    an offer, in accord with Subsection b above.)\n\
+\n\
+The source code for a work means the preferred form of the work for\n\
+making modifications to it.  For an executable work, complete source\n\
+code means all the source code for all modules it contains, plus any\n\
+associated interface definition files, plus the scripts used to\n\
+control compilation and installation of the executable.  However, as a\n\
+special exception, the source code distributed need not include\n\
+anything that is normally distributed (in either source or binary\n\
+form) with the major components (compiler, kernel, and so on) of the\n\
+operating system on which the executable runs, unless that component\n\
+itself accompanies the executable.\n\
+\n\
+If distribution of executable or object code is made by offering\n\
+access to copy from a designated place, then offering equivalent\n\
+access to copy the source code from the same place counts as\n\
+distribution of the source code, even though third parties are not\n\
+compelled to copy the source along with the object code.\n\
+\f\n\
+  4. You may not copy, modify, sublicense, or distribute the Program\n\
+except as expressly provided under this License.  Any attempt\n\
+otherwise to copy, modify, sublicense or distribute the Program is\n\
+void, and will automatically terminate your rights under this License.\n\
+However, parties who have received copies, or rights, from you under\n\
+this License will not have their licenses terminated so long as such\n\
+parties remain in full compliance.\n\
+\n\
+  5. You are not required to accept this License, since you have not\n\
+signed it.  However, nothing else grants you permission to modify or\n\
+distribute the Program or its derivative works.  These actions are\n\
+prohibited by law if you do not accept this License.  Therefore, by\n\
+modifying or distributing the Program (or any work based on the\n\
+Program), you indicate your acceptance of this License to do so, and\n\
+all its terms and conditions for copying, distributing or modifying\n\
+the Program or works based on it.\n\
+\n\
+  6. Each time you redistribute the Program (or any work based on the\n\
+Program), the recipient automatically receives a license from the\n\
+original licensor to copy, distribute or modify the Program subject to\n\
+these terms and conditions.  You may not impose any further\n\
+restrictions on the recipients' exercise of the rights granted herein.\n\
+You are not responsible for enforcing compliance by third parties to\n\
+this License.\n\
+\n\
+  7. If, as a consequence of a court judgment or allegation of patent\n\
+infringement or for any other reason (not limited to patent issues),\n\
+conditions are imposed on you (whether by court order, agreement or\n\
+otherwise) that contradict the conditions of this License, they do not\n\
+excuse you from the conditions of this License.  If you cannot\n\
+distribute so as to satisfy simultaneously your obligations under this\n\
+License and any other pertinent obligations, then as a consequence you\n\
+may not distribute the Program at all.  For example, if a patent\n\
+license would not permit royalty-free redistribution of the Program by\n\
+all those who receive copies directly or indirectly through you, then\n\
+the only way you could satisfy both it and this License would be to\n\
+refrain entirely from distribution of the Program.\n\
+\n\
+If any portion of this section is held invalid or unenforceable under\n\
+any particular circumstance, the balance of the section is intended to\n\
+apply and the section as a whole is intended to apply in other\n\
+circumstances.\n\
+\n\
+It is not the purpose of this section to induce you to infringe any\n\
+patents or other property right claims or to contest validity of any\n\
+such claims; this section has the sole purpose of protecting the\n\
+integrity of the free software distribution system, which is\n\
+implemented by public license practices.  Many people have made\n\
+generous contributions to the wide range of software distributed\n\
+through that system in reliance on consistent application of that\n\
+system; it is up to the author/donor to decide if he or she is willing\n\
+to distribute software through any other system and a licensee cannot\n\
+impose that choice.\n\
+\n\
+This section is intended to make thoroughly clear what is believed to\n\
+be a consequence of the rest of this License.\n\
+\n\
+  8. If the distribution and/or use of the Program is restricted in\n\
+certain countries either by patents or by copyrighted interfaces, the\n\
+original copyright holder who places the Program under this License\n\
+may add an explicit geographical distribution limitation excluding\n\
+those countries, so that distribution is permitted only in or among\n\
+countries not thus excluded.  In such case, this License incorporates\n\
+the limitation as if written in the body of this License.\n\
+\n\
+  9. The Free Software Foundation may publish revised and/or new versions\n\
+of the General Public License from time to time.  Such new versions will\n\
+be similar in spirit to the present version, but may differ in detail to\n\
+address new problems or concerns.\n\
+\n\
+Each version is given a distinguishing version number.  If the Program\n\
+specifies a version number of this License which applies to it and \"any\n\
+later version\", you have the option of following the terms and conditions\n\
+either of that version or of any later version published by the Free\n\
+Software Foundation.  If the Program does not specify a version number of\n\
+this License, you may choose any version ever published by the Free Software\n\
+Foundation.\n\
+\n\
+  10. If you wish to incorporate parts of the Program into other free\n\
+programs whose distribution conditions are different, write to the author\n\
+to ask for permission.  For software which is copyrighted by the Free\n\
+Software Foundation, write to the Free Software Foundation; we sometimes\n\
+make exceptions for this.  Our decision will be guided by the two goals\n\
+of preserving the free status of all derivatives of our free software and\n\
+of promoting the sharing and reuse of software generally.\n\
+\n\
+                           NO WARRANTY\n\
+\n\
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n\
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n\
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n\
+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n\
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n\
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n\
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n\
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n\
+REPAIR OR CORRECTION.\n\
+\n\
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n\
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n\
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n\
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n\
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n\
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n\
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n\
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n\
+POSSIBILITY OF SUCH DAMAGES.\n\
+\n\
+                    END OF TERMS AND CONDITIONS\n\
+\n\
+           How to Apply These Terms to Your New Programs\n\
+\n\
+  If you develop a new program, and you want it to be of the greatest\n\
+possible use to the public, the best way to achieve this is to make it\n\
+free software which everyone can redistribute and change under these terms.\n\
+\n\
+  To do so, attach the following notices to the program.  It is safest\n\
+to attach them to the start of each source file to most effectively\n\
+convey the exclusion of warranty; and each file should have at least\n\
+the \"copyright\" line and a pointer to where the full notice is found.\n\
+\n\
+    <one line to give the program's name and a brief idea of what it does.>\n\
+    Copyright (C) <year>  <name of author>\n\
+\n\
+    This program is free software; you can redistribute it and/or modify\n\
+    it under the terms of the GNU General Public License as published by\n\
+    the Free Software Foundation; either version 2 of the License, or\n\
+    (at your option) any later version.\n\
+\n\
+    This program is distributed in the hope that it will be useful,\n\
+    but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
+    GNU General Public License for more details.\n\
+\n\
+    You should have received a copy of the GNU General Public License\n\
+    along with this program; if not, write to the Free Software\n\
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n\
+\n\
+\n\
+Also add information on how to contact you by electronic and paper mail.\n\
+\n\
+If the program is interactive, make it output a short notice like this\n\
+when it starts in an interactive mode:\n\
+\n\
+    Gnomovision version 69, Copyright (C) year  name of author\n\
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n\
+    This is free software, and you are welcome to redistribute it\n\
+    under certain conditions; type `show c' for details.\n\
+\n\
+The hypothetical commands `show w' and `show c' should show the appropriate\n\
+parts of the General Public License.  Of course, the commands you use may\n\
+be called something other than `show w' and `show c'; they could even be\n\
+mouse-clicks or menu items--whatever suits your program.\n\
+\n\
+You should also get your employer (if you work as a programmer) or your\n\
+school, if any, to sign a \"copyright disclaimer\" for the program, if\n\
+necessary.  Here is a sample; alter the names:\n\
+\n\
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n\
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n\
+\n\
+  <signature of Ty Coon>, 1 April 1989\n\
+  Ty Coon, President of Vice\n\
+\n\
+This General Public License does not permit incorporating your program into\n\
+proprietary programs.  If your program is a subroutine library, you may\n\
+consider it more useful to permit linking proprietary applications with the\n\
+library.  If this is what you want to do, use the GNU Library General\n\
+Public License instead of this License.\n\
+";
+

diff --git a/src/gtk/gpl.h b/src/gtk/gpl.h
new file mode 100644 (file)
index 0000000..c9c4ffe
--- /dev/null
+++ b/src/gtk/gpl.h
@@ -0,0 +1,24 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/gpl.h
+ *  @brief The GPL.
+ */
+
+extern const char * gpl;

diff --git a/src/gtk/gtk_util.cc b/src/gtk/gtk_util.cc
new file mode 100644 (file)
index 0000000..41f8cb5
--- /dev/null
+++ b/src/gtk/gtk_util.cc
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/gtk/util.cc
+ *  @brief Some utility functions.
+ */
+
+#include <gtkmm.h>
+
+using namespace std;
+
+/** @param t Label text.
+ *  @return GTK label containing t, left-aligned (passed through Gtk::manage)
+ */
+Gtk::Label &
+left_aligned_label (string t)
+{
+       Gtk::Label* l = Gtk::manage (new Gtk::Label (t));
+       l->set_alignment (0, 0.5);
+       return *l;
+}
+
+void
+error_dialog (string m)
+{
+       Gtk::MessageDialog d (m, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
+       d.set_title ("DVD-o-matic");
+       d.run ();
+}

diff --git a/src/gtk/gtk_util.h b/src/gtk/gtk_util.h
new file mode 100644 (file)
index 0000000..5188428
--- /dev/null
+++ b/src/gtk/gtk_util.h
@@ -0,0 +1,27 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <gtkmm.h>
+
+/** @file src/gtk/util.h
+ *  @brief Some utility functions.
+ */
+
+extern void error_dialog (std::string);
+extern Gtk::Label & left_aligned_label (std::string);

diff --git a/src/gtk/job_manager_view.cc b/src/gtk/job_manager_view.cc
new file mode 100644 (file)
index 0000000..60c1399
--- /dev/null
+++ b/src/gtk/job_manager_view.cc
@@ -0,0 +1,134 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/job_manager_view.cc
+ *  @brief Class generating a GTK widget to show the progress of jobs.
+ */
+
+#include "lib/job_manager.h"
+#include "lib/job.h"
+#include "lib/util.h"
+#include "lib/exceptions.h"
+#include "job_manager_view.h"
+#include "gtk_util.h"
+
+using namespace std;
+using namespace boost;
+
+/** Must be called in the GUI thread */
+JobManagerView::JobManagerView ()
+{
+       _scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
+       
+       _store = Gtk::TreeStore::create (_columns);
+       _view.set_model (_store);
+       _view.append_column ("Name", _columns.name);
+
+       Gtk::CellRendererProgress* r = Gtk::manage (new Gtk::CellRendererProgress ());
+       int const n = _view.append_column ("Progress", *r);
+       Gtk::TreeViewColumn* c = _view.get_column (n - 1);
+       c->add_attribute (r->property_value(), _columns.progress);
+       c->add_attribute (r->property_pulse(), _columns.progress_unknown);
+       c->add_attribute (r->property_text(), _columns.text);
+
+       _scroller.add (_view);
+       _scroller.set_size_request (-1, 150);
+       
+       update ();
+}
+
+/** Update the view by examining the state of each jobs.
+ *  Must be called in the GUI thread.
+ */
+void
+JobManagerView::update ()
+{
+       list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
+
+       for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
+               Gtk::ListStore::iterator j = _store->children().begin();
+               while (j != _store->children().end()) {
+                       Gtk::TreeRow r = *j;
+                       shared_ptr<Job> job = r[_columns.job];
+                       if (job == *i) {
+                               break;
+                       }
+                       ++j;
+               }
+
+               Gtk::TreeRow r;
+               if (j == _store->children().end ()) {
+                       j = _store->append ();
+                       r = *j;
+                       r[_columns.name] = (*i)->name ();
+                       r[_columns.job] = *i;
+                       r[_columns.progress_unknown] = -1;
+                       r[_columns.informed_of_finish] = false;
+               } else {
+                       r = *j;
+               }
+
+               bool inform_of_finish = false;
+               string const st = (*i)->status ();
+
+               if (!(*i)->finished ()) {
+                       float const p = (*i)->overall_progress ();
+                       if (p >= 0) {
+                               r[_columns.text] = st;
+                               r[_columns.progress] = p * 100;
+                       } else {
+                               r[_columns.progress_unknown] = r[_columns.progress_unknown] + 1;
+                       }
+               }
+               
+               /* Hack to work around our lack of cross-thread
+                  signalling; we tell the job to emit_finished()
+                  from here (the GUI thread).
+               */
+               
+               if ((*i)->finished_ok ()) {
+                       bool i = r[_columns.informed_of_finish];
+                       if (!i) {
+                               r[_columns.progress_unknown] = -1;
+                               r[_columns.progress] = 100;
+                               r[_columns.text] = st;
+                               inform_of_finish = true;
+                       }
+               } else if ((*i)->finished_in_error ()) {
+                       bool i = r[_columns.informed_of_finish];
+                       if (!i) {
+                               r[_columns.progress_unknown] = -1;
+                               r[_columns.progress] = 100;
+                               r[_columns.text] = st;
+                               inform_of_finish = true;
+                       }
+               }
+
+               if (inform_of_finish) {
+                       try {
+                               (*i)->emit_finished ();
+                       } catch (OpenFileError& e) {
+                               stringstream s;
+                               s << "Error: " << e.what();
+                               error_dialog (s.str ());
+                       }
+                       r[_columns.informed_of_finish] = true;
+               }
+       }
+}

diff --git a/src/gtk/job_manager_view.h b/src/gtk/job_manager_view.h
new file mode 100644 (file)
index 0000000..c88a1ce
--- /dev/null
+++ b/src/gtk/job_manager_view.h
@@ -0,0 +1,83 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/job_manager_view.h
+ *  @brief Class generating a GTK widget to show the progress of jobs.
+ */
+
+#include <string>
+#include <boost/shared_ptr.hpp>
+#include <gtkmm.h>
+
+class Job;
+
+/** @class JobManagerView
+ *  @brief Class generating a GTK widget to show the progress of jobs.
+ */
+class JobManagerView
+{
+public:
+       JobManagerView ();
+
+       /** @return Our main widget, which contains everything else */
+       Gtk::Widget& widget () {
+               return _scroller;
+       }
+
+       void update ();
+
+private:
+       /** Scroller for all our contents */
+       Gtk::ScrolledWindow _scroller;
+       /** View for the jobs */
+       Gtk::TreeView _view;
+       /** Store for the jobs */
+       Glib::RefPtr<Gtk::TreeStore> _store;
+
+       /** The TreeModelColumnRecord for the store */
+       class StoreColumns : public Gtk::TreeModelColumnRecord
+       {
+       public:
+               StoreColumns ()
+               {
+                       add (name);
+                       add (job);
+                       add (progress);
+                       add (progress_unknown);
+                       add (text);
+                       add (informed_of_finish);
+               }
+
+               /** Job name */
+               Gtk::TreeModelColumn<std::string> name;
+               /** Job */
+               Gtk::TreeModelColumn<boost::shared_ptr<Job> > job;
+               /** Progress */
+               Gtk::TreeModelColumn<float> progress;
+               /** An increasing integer number if the progress is unknown */
+               Gtk::TreeModelColumn<int> progress_unknown;
+               /** Text to write into the progress bar */
+               Gtk::TreeModelColumn<std::string> text;
+               /** true if the job has been informed of its finish */
+               Gtk::TreeModelColumn<bool> informed_of_finish;
+       };
+
+       /** The columns for the store */
+       StoreColumns _columns;
+};

diff --git a/src/gtk/job_wrapper.cc b/src/gtk/job_wrapper.cc
new file mode 100644 (file)
index 0000000..be214b0
--- /dev/null
+++ b/src/gtk/job_wrapper.cc
@@ -0,0 +1,50 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <sstream>
+#include "lib/film.h"
+#include "lib/exceptions.h"
+#include "job_wrapper.h"
+#include "gtk_util.h"
+
+using namespace std;
+
+void
+JobWrapper::make_dcp (Film* film, bool transcode)
+{
+       if (!film) {
+               return;
+       }
+
+       try {
+               film->make_dcp (transcode);
+       } catch (BadSettingError& e) {
+               stringstream s;
+               if (e.setting() == "dcp_long_name") {
+                       s << "Could not make DCP: long name is invalid (" << e.what() << ")";
+               } else {
+                       s << "Bad setting for " << e.setting() << "(" << e.what() << ")";
+               }
+               error_dialog (s.str ());
+       } catch (std::exception& e) {
+               stringstream s;
+               s << "Could not make DCP: " << e.what () << ".";
+               error_dialog (s.str ());
+       }
+}

diff --git a/src/gtk/job_wrapper.h b/src/gtk/job_wrapper.h
new file mode 100644 (file)
index 0000000..b8760f6
--- /dev/null
+++ b/src/gtk/job_wrapper.h
@@ -0,0 +1,27 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+class Film;
+
+namespace JobWrapper
+{
+
+void make_dcp (Film *, bool);
+       
+}

diff --git a/src/gtk/wscript b/src/gtk/wscript
new file mode 100644 (file)
index 0000000..c68efea
--- /dev/null
+++ b/src/gtk/wscript
@@ -0,0 +1,22 @@
+def build(bld):
+    obj = bld(features = 'cxx cxxshlib')
+    obj.name   = 'libdvdomatic-gtk'
+    obj.includes = [ '..' ]
+    obj.export_includes = ['.']
+    obj.uselib = 'GLIB GTKMM CAIROMM'
+    obj.source = """
+                 alignment.cc
+                config_dialog.cc
+                dcp_range_dialog.cc
+                film_editor.cc
+                 film_list.cc
+                 film_player.cc
+                film_viewer.cc
+                filter_dialog.cc
+                filter_view.cc
+                gpl.cc
+                job_manager_view.cc
+                gtk_util.cc
+                 job_wrapper.cc
+                """
+    obj.target = 'dvdomatic-gtk'

diff --git a/src/lib/ab_transcode_job.cc b/src/lib/ab_transcode_job.cc
new file mode 100644 (file)
index 0000000..1a61042
--- /dev/null
+++ b/src/lib/ab_transcode_job.cc
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <stdexcept>
+#include "ab_transcode_job.h"
+#include "j2k_wav_encoder.h"
+#include "film.h"
+#include "format.h"
+#include "filter.h"
+#include "ab_transcoder.h"
+#include "film_state.h"
+#include "encoder_factory.h"
+#include "config.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param s FilmState to compare (with filters and/or a non-bicubic scaler).
+ *  @param o Options.
+ *  @Param l A log that we can write to.
+ */
+ABTranscodeJob::ABTranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : Job (s, o, l)
+{
+       _fs_b.reset (new FilmState (*_fs));
+       _fs_b->scaler = Config::instance()->reference_scaler ();
+       _fs_b->filters = Config::instance()->reference_filters ();
+}
+
+string
+ABTranscodeJob::name () const
+{
+       stringstream s;
+       s << "A/B transcode " << _fs->name;
+       return s.str ();
+}
+
+void
+ABTranscodeJob::run ()
+{
+       try {
+               /* _fs_b is the one with no filters */
+               ABTranscoder w (_fs_b, _fs, _opt, this, _log, encoder_factory (_fs, _opt, _log));
+               w.go ();
+               set_progress (1);
+               set_state (FINISHED_OK);
+
+       } catch (std::exception& e) {
+
+               set_state (FINISHED_ERROR);
+
+       }
+}

diff --git a/src/lib/ab_transcode_job.h b/src/lib/ab_transcode_job.h
new file mode 100644 (file)
index 0000000..4780490
--- /dev/null
+++ b/src/lib/ab_transcode_job.h
@@ -0,0 +1,47 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/ab_transcode_job.h
+ *  @brief Job to run a transcoder which produces output for A/B comparison of various settings.
+ */
+
+#include <boost/shared_ptr.hpp>
+#include "job.h"
+
+/** @class ABTranscodeJob
+ *  @brief Job to run a transcoder which produces output for A/B comparison of various settings.
+ *
+ *  The right half of the frame will be processed using the FilmState supplied;
+ *  the left half will be processed using the same state but *without* filters
+ *  and with the scaler set to SWS_BICUBIC.
+ */
+class ABTranscodeJob : public Job
+{
+public:
+       ABTranscodeJob (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+
+       std::string name () const;
+       void run ();
+
+private:
+       /** Copy of our FilmState with filters removed and scaler set back to bicubic;
+        *  this is the `reference' (left-half-frame) state.
+        */
+       boost::shared_ptr<FilmState> _fs_b;
+};

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
new file mode 100644 (file)
index 0000000..aabaf2d
--- /dev/null
+++ b/src/lib/ab_transcoder.cc
@@ -0,0 +1,127 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <boost/shared_ptr.hpp>
+#include <sigc++/bind.h>
+#include "ab_transcoder.h"
+#include "film.h"
+#include "decoder.h"
+#include "encoder.h"
+#include "job.h"
+#include "film_state.h"
+#include "options.h"
+#include "image.h"
+#include "decoder_factory.h"
+
+/** @file src/ab_transcoder.cc
+ *  @brief A transcoder which uses one FilmState for the left half of the screen, and a different one
+ *  for the right half (to facilitate A/B comparisons of settings)
+ */
+
+using namespace std;
+using namespace boost;
+
+/** @param a FilmState to use for the left half of the screen.
+ *  @param b FilmState to use for the right half of the screen.
+ *  @param o Options.
+ *  @param j Job that we are associated with.
+ *  @param l Log.
+ *  @param e Encoder to use.
+ */
+
+ABTranscoder::ABTranscoder (
+       shared_ptr<const FilmState> a, shared_ptr<const FilmState> b, shared_ptr<const Options> o, Job* j, Log* l, shared_ptr<Encoder> e)
+       : _fs_a (a)
+       , _fs_b (b)
+       , _opt (o)
+       , _job (j)
+       , _log (l)
+       , _encoder (e)
+       , _last_frame (0)
+{
+       _da = decoder_factory (_fs_a, o, j, _log);
+       _db = decoder_factory (_fs_b, o, j, _log);
+
+       _da->Video.connect (sigc::bind (sigc::mem_fun (*this, &ABTranscoder::process_video), 0));
+       _db->Video.connect (sigc::bind (sigc::mem_fun (*this, &ABTranscoder::process_video), 1));
+       _da->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
+}
+
+ABTranscoder::~ABTranscoder ()
+{
+
+}
+
+void
+ABTranscoder::process_video (shared_ptr<Image> yuv, int frame, int index)
+{
+       if (index == 0) {
+               /* Keep this image around until we get the other half */
+               _image = yuv;
+       } else {
+               /* Copy the right half of yuv into _image */
+               for (int i = 0; i < yuv->components(); ++i) {
+                       int const line_size = yuv->line_size()[i];
+                       int const half_line_size = line_size / 2;
+
+                       uint8_t* p = _image->data()[i];
+                       uint8_t* q = yuv->data()[i];
+                       
+                       for (int j = 0; j < yuv->lines (i); ++j) {
+                               memcpy (p + half_line_size, q + half_line_size, half_line_size);
+                               p += line_size;
+                               q += line_size;
+                       }
+               }
+                       
+               /* And pass it to the encoder */
+               _encoder->process_video (_image, frame);
+               _image.reset ();
+       }
+       
+       _last_frame = frame;
+}
+
+
+void
+ABTranscoder::go ()
+{
+       _encoder->process_begin ();
+       _da->process_begin ();
+       _db->process_begin ();
+       
+       while (1) {
+               bool const a = _da->pass ();
+               bool const b = _db->pass ();
+
+               if (_job) {
+                       _job->set_progress (float (_last_frame) / _da->decoding_frames ());
+               }
+               
+               if (a && b) {
+                       break;
+               }
+       }
+
+       _encoder->process_end ();
+       _da->process_end ();
+       _db->process_end ();
+}
+                           

diff --git a/src/lib/ab_transcoder.h b/src/lib/ab_transcoder.h
new file mode 100644 (file)
index 0000000..0310bb9
--- /dev/null
+++ b/src/lib/ab_transcoder.h
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/ab_transcoder.h
+ *  @brief A transcoder which uses one FilmState for the left half of the screen, and a different one
+ *  for the right half (to facilitate A/B comparisons of settings)
+ */
+
+#include <boost/shared_ptr.hpp>
+#include <stdint.h>
+
+class Job;
+class Encoder;
+class Decoder;
+class FilmState;
+class Options;
+class Image;
+class Log;
+
+/** @class ABTranscoder
+ *  @brief A transcoder which uses one FilmState for the left half of the screen, and a different one
+ *  for the right half (to facilitate A/B comparisons of settings)
+ */
+class ABTranscoder
+{
+public:
+       ABTranscoder (
+               boost::shared_ptr<const FilmState> a,
+               boost::shared_ptr<const FilmState> b,
+               boost::shared_ptr<const Options> o,
+               Job* j,
+               Log* l,
+               boost::shared_ptr<Encoder> e
+               );
+       
+       ~ABTranscoder ();
+
+       void go ();
+
+private:
+       void process_video (boost::shared_ptr<Image>, int, int);
+       
+       boost::shared_ptr<const FilmState> _fs_a;
+       boost::shared_ptr<const FilmState> _fs_b;
+       boost::shared_ptr<const Options> _opt;
+       Job* _job;
+       Log* _log;
+       boost::shared_ptr<Encoder> _encoder;
+       boost::shared_ptr<Decoder> _da;
+       boost::shared_ptr<Decoder> _db;
+       int _last_frame;
+       boost::shared_ptr<Image> _image;
+};

diff --git a/src/lib/config.cc b/src/lib/config.cc
new file mode 100644 (file)
index 0000000..6d31ccd
--- /dev/null
+++ b/src/lib/config.cc
@@ -0,0 +1,139 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <sstream>
+#include <cstdlib>
+#include <fstream>
+#include "config.h"
+#include "server.h"
+#include "scaler.h"
+#include "screen.h"
+#include "filter.h"
+
+using namespace std;
+using namespace boost;
+
+Config* Config::_instance = 0;
+
+/** Construct default configuration */
+Config::Config ()
+       : _num_local_encoding_threads (2)
+       , _server_port (6192)
+       , _colour_lut_index (0)
+       , _j2k_bandwidth (250000000)
+       , _reference_scaler (Scaler::from_id ("bicubic"))
+       , _tms_path (".")
+{
+       ifstream f (file().c_str ());
+       string line;
+       while (getline (f, line)) {
+               if (line.empty ()) {
+                       continue;
+               }
+
+               if (line[0] == '#') {
+                       continue;
+               }
+
+               size_t const s = line.find (' ');
+               if (s == string::npos) {
+                       continue;
+               }
+               
+               string const k = line.substr (0, s);
+               string const v = line.substr (s + 1);
+
+               if (k == "num_local_encoding_threads") {
+                       _num_local_encoding_threads = atoi (v.c_str ());
+               } else if (k == "server_port") {
+                       _server_port = atoi (v.c_str ());
+               } else if (k == "colour_lut_index") {
+                       _colour_lut_index = atoi (v.c_str ());
+               } else if (k == "j2k_bandwidth") {
+                       _j2k_bandwidth = atoi (v.c_str ());
+               } else if (k == "reference_scaler") {
+                       _reference_scaler = Scaler::from_id (v);
+               } else if (k == "reference_filter") {
+                       _reference_filters.push_back (Filter::from_id (v));
+               } else if (k == "server") {
+                       _servers.push_back (Server::create_from_metadata (v));
+               } else if (k == "screen") {
+                       _screens.push_back (Screen::create_from_metadata (v));
+               } else if (k == "tms_ip") {
+                       _tms_ip = v;
+               } else if (k == "tms_path") {
+                       _tms_path = v;
+               } else if (k == "tms_user") {
+                       _tms_user = v;
+               } else if (k == "tms_password") {
+                       _tms_password = v;
+               }
+       }
+
+       Changed ();
+}
+
+/** @return Filename to write configuration to */
+string
+Config::file () const
+{
+       stringstream s;
+       s << getenv ("HOME") << "/.dvdomatic";
+       return s.str ();
+}
+
+/** @return Singleton instance */
+Config *
+Config::instance ()
+{
+       if (_instance == 0) {
+               _instance = new Config;
+       }
+
+       return _instance;
+}
+
+/** Write our configuration to disk */
+void
+Config::write () const
+{
+       ofstream f (file().c_str ());
+       f << "num_local_encoding_threads " << _num_local_encoding_threads << "\n"
+         << "server_port " << _server_port << "\n"
+         << "colour_lut_index " << _colour_lut_index << "\n"
+         << "j2k_bandwidth " << _j2k_bandwidth << "\n"
+         << "reference_scaler " << _reference_scaler->id () << "\n";
+
+       for (vector<Filter const *>::const_iterator i = _reference_filters.begin(); i != _reference_filters.end(); ++i) {
+               f << "reference_filter " << (*i)->id () << "\n";
+       }
+       
+       for (vector<Server*>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
+               f << "server " << (*i)->as_metadata () << "\n";
+       }
+
+       for (vector<shared_ptr<Screen> >::const_iterator i = _screens.begin(); i != _screens.end(); ++i) {
+               f << "screen " << (*i)->as_metadata () << "\n";
+       }
+
+       f << "tms_ip " << _tms_ip << "\n";
+       f << "tms_path " << _tms_path << "\n";
+       f << "tms_user " << _tms_user << "\n";
+       f << "tms_password " << _tms_password << "\n";
+}

diff --git a/src/lib/config.h b/src/lib/config.h
new file mode 100644 (file)
index 0000000..62fcebb
--- /dev/null
+++ b/src/lib/config.h
@@ -0,0 +1,207 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/config.h
+ *  @brief Class holding configuration.
+ */
+
+#ifndef DVDOMATIC_CONFIG_H
+#define DVDOMATIC_CONFIG_H
+
+#include <vector>
+#include <boost/shared_ptr.hpp>
+#include <sigc++/signal.h>
+
+class Server;
+class Screen;
+class Scaler;
+class Filter;
+
+/** @class Config
+ *  @brief A singleton class holding configuration.
+ */
+class Config
+{
+public:
+
+       /** @return number of threads to use for J2K encoding on the local machine */
+       int num_local_encoding_threads () const {
+               return _num_local_encoding_threads;
+       }
+
+       /** @return port to use for J2K encoding servers */
+       int server_port () const {
+               return _server_port;
+       }
+
+       /** @return index of colour LUT to use when converting RGB to XYZ.
+        *  0: sRGB
+        *  1: Rec 709
+        *  2: DC28
+        */
+       int colour_lut_index () const {
+               return _colour_lut_index;
+       }
+
+       /** @return bandwidth for J2K files in bits per second */
+       int j2k_bandwidth () const {
+               return _j2k_bandwidth;
+       }
+
+       /** @return J2K encoding servers to use */
+       std::vector<Server*> servers () const {
+               return _servers;
+       }
+
+       std::vector<boost::shared_ptr<Screen> > screens () const {
+               return _screens;
+       }
+
+       Scaler const * reference_scaler () const {
+               return _reference_scaler;
+       }
+
+       std::vector<Filter const *> reference_filters () const {
+               return _reference_filters;
+       }
+
+       std::string tms_ip () const {
+               return _tms_ip;
+       }
+
+       std::string tms_path () const {
+               return _tms_path;
+       }
+
+       std::string tms_user () const {
+               return _tms_user;
+       }
+
+       std::string tms_password () const {
+               return _tms_password;
+       }
+
+       /** @param n New number of local encoding threads */
+       void set_num_local_encoding_threads (int n) {
+               _num_local_encoding_threads = n;
+               Changed ();
+       }
+
+       /** @param p New server port */
+       void set_sever_port (int p) {
+               _server_port = p;
+               Changed ();
+       }
+
+       /** @param i New colour LUT index */
+       void set_colour_lut_index (int i) {
+               _colour_lut_index = i;
+               Changed ();
+       }
+
+       /** @param b New J2K bandwidth */
+       void set_j2k_bandwidth (int b) {
+               _j2k_bandwidth = b;
+               Changed ();
+       }
+
+       /** @param s New list of servers */
+       void set_servers (std::vector<Server*> s) {
+               _servers = s;
+               Changed ();
+       }
+
+       void set_screens (std::vector<boost::shared_ptr<Screen> > s) {
+               _screens = s;
+               Changed ();
+       }
+
+       void set_reference_scaler (Scaler const * s) {
+               _reference_scaler = s;
+               Changed ();
+       }
+       
+       void set_reference_filters (std::vector<Filter const *> const & f) {
+               _reference_filters = f;
+               Changed ();
+       }
+
+       void set_tms_ip (std::string i) {
+               _tms_ip = i;
+               Changed ();
+       }
+
+       void set_tms_path (std::string p) {
+               _tms_path = p;
+               Changed ();
+       }
+
+       void set_tms_user (std::string u) {
+               _tms_user = u;
+               Changed ();
+       }
+
+       void set_tms_password (std::string p) {
+               _tms_password = p;
+               Changed ();
+       }
+       
+       void write () const;
+
+       sigc::signal0<void> Changed;
+
+       static Config* instance ();
+
+private:
+       Config ();
+       std::string file () const;
+
+       /** number of threads to use for J2K encoding on the local machine */
+       int _num_local_encoding_threads;
+       /** port to use for J2K encoding servers */
+       int _server_port;
+       /** index of colour LUT to use when converting RGB to XYZ
+        *  (see colour_lut_index ())
+        */
+       int _colour_lut_index;
+       /** bandwidth for J2K files in Mb/s */
+       int _j2k_bandwidth;
+
+       /** J2K encoding servers to use */
+       std::vector<Server *> _servers;
+
+       /** Screen definitions */
+       std::vector<boost::shared_ptr<Screen> > _screens;
+
+       /** Scaler to use for the "A" part of A/B comparisons */
+       Scaler const * _reference_scaler;
+
+       /** Filters to use for the "A" part of A/B comparisons */
+       std::vector<Filter const *> _reference_filters;
+
+       std::string _tms_ip;
+       std::string _tms_path;
+       std::string _tms_user;
+       std::string _tms_password;
+
+       /** Singleton instance, or 0 */
+       static Config* _instance;
+};
+
+#endif

diff --git a/src/lib/copy_from_dvd_job.cc b/src/lib/copy_from_dvd_job.cc
new file mode 100644 (file)
index 0000000..b82169a
--- /dev/null
+++ b/src/lib/copy_from_dvd_job.cc
@@ -0,0 +1,103 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/copy_from_dvd_job.cc
+ *  @brief A job to copy a film from a DVD.
+ */
+
+#include <stdio.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
+#include "copy_from_dvd_job.h"
+#include "film_state.h"
+#include "dvd.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param fs FilmState for the film to write DVD data into.
+ *  @param l Log that we can write to.
+ */
+CopyFromDVDJob::CopyFromDVDJob (shared_ptr<const FilmState> fs, Log* l)
+       : Job (fs, shared_ptr<Options> (), l)
+{
+
+}
+
+string
+CopyFromDVDJob::name () const
+{
+       return "Copy film from DVD";
+}
+
+void
+CopyFromDVDJob::run ()
+{
+       /* Remove any old DVD rips */
+       filesystem::remove_all (_fs->dir ("dvd"));
+
+       string const dvd = find_dvd ();
+       if (dvd.empty ()) {
+               set_error ("could not find DVD");
+               set_state (FINISHED_ERROR);
+       }
+
+       vector<uint64_t> const t = dvd_titles (dvd);
+       if (t.empty ()) {
+               set_error ("no titles found on DVD");
+               set_state (FINISHED_ERROR);
+       }
+
+       int longest_title = 0;
+       uint64_t longest_size = 0;
+       for (vector<int>::size_type i = 0; i < t.size(); ++i) {
+               if (longest_size < t[i]) {
+                       longest_size = t[i];
+                       longest_title = i;
+               }
+       }
+
+       stringstream c;
+       c << "vobcopy -n " << longest_title << " -l -o \"" << _fs->dir ("dvd") << "\" 2>&1";
+
+       FILE* f = popen (c.str().c_str(), "r");
+       if (f == 0) {
+               set_error ("could not run vobcopy command");
+               set_state (FINISHED_ERROR);
+               return;
+       }
+
+       while (!feof (f)) {
+               char buf[256];
+               if (fscanf (f, "%s", buf)) {
+                       string s (buf);
+                       if (!s.empty () && s[s.length() - 1] == '%') {
+                               set_progress (atof (s.substr(0, s.length() - 1).c_str()) / 100.0);
+                       }
+               }
+       }
+
+       int const r = pclose (f);
+       if (WEXITSTATUS (r) != 0) {
+               set_error ("call to vobcopy failed");
+               set_state (FINISHED_ERROR);
+       } else {
+               set_state (FINISHED_OK);
+       }
+}

diff --git a/src/lib/copy_from_dvd_job.h b/src/lib/copy_from_dvd_job.h
new file mode 100644 (file)
index 0000000..6b56f6f
--- /dev/null
+++ b/src/lib/copy_from_dvd_job.h
@@ -0,0 +1,36 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/copy_from_dvd_job.h
+ *  @brief A job to copy a film from a DVD.
+ */
+
+#include "job.h"
+
+/** @class CopyFromDVDJob
+ *  @brief A job to copy a film from a DVD using `vobcopy'.
+ */
+class CopyFromDVDJob : public Job
+{
+public:
+       CopyFromDVDJob (boost::shared_ptr<const FilmState>, Log *);
+
+       std::string name () const;
+       void run ();
+};

diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc
new file mode 100644 (file)
index 0000000..72a26e4
--- /dev/null
+++ b/src/lib/dcp_content_type.cc
@@ -0,0 +1,91 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/content_type.cc
+ *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
+ */
+
+#include <cassert>
+#include "dcp_content_type.h"
+
+using namespace std;
+
+vector<DCPContentType const *> DCPContentType::_dcp_content_types;
+
+DCPContentType::DCPContentType (string p, string o)
+       : _pretty_name (p)
+       , _opendcp_name (o)
+{
+
+}
+
+void
+DCPContentType::setup_dcp_content_types ()
+{
+       _dcp_content_types.push_back (new DCPContentType ("Feature", "feature"));
+       _dcp_content_types.push_back (new DCPContentType ("Short", "short"));
+       _dcp_content_types.push_back (new DCPContentType ("Trailer", "trailer"));
+       _dcp_content_types.push_back (new DCPContentType ("Test", "test"));
+       _dcp_content_types.push_back (new DCPContentType ("Transitional", "transitional"));
+       _dcp_content_types.push_back (new DCPContentType ("Rating", "rating"));
+       _dcp_content_types.push_back (new DCPContentType ("Teaser", "teaster"));
+       _dcp_content_types.push_back (new DCPContentType ("Policy", "policy"));
+       _dcp_content_types.push_back (new DCPContentType ("Public Service Announcement", "psa"));
+       _dcp_content_types.push_back (new DCPContentType ("Advertisement", "advertisement"));
+}
+
+DCPContentType const *
+DCPContentType::from_pretty_name (string n)
+{
+       for (vector<DCPContentType const *>::const_iterator i = _dcp_content_types.begin(); i != _dcp_content_types.end(); ++i) {
+               if ((*i)->pretty_name() == n) {
+                       return *i;
+               }
+       }
+
+       return 0;
+}
+
+DCPContentType const *
+DCPContentType::from_index (int n)
+{
+       assert (n >= 0 && n < int (_dcp_content_types.size ()));
+       return _dcp_content_types[n];
+}
+
+int
+DCPContentType::as_index (DCPContentType const * c)
+{
+       vector<DCPContentType*>::size_type i = 0;
+       while (i < _dcp_content_types.size() && _dcp_content_types[i] != c) {
+               ++i;
+       }
+
+       if (i == _dcp_content_types.size ()) {
+               return -1;
+       }
+
+       return i;
+}
+
+vector<DCPContentType const *>
+DCPContentType::all ()
+{
+       return _dcp_content_types;
+}

diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
new file mode 100644 (file)
index 0000000..cade673
--- /dev/null
+++ b/src/lib/dcp_content_type.h
@@ -0,0 +1,58 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/content_type.h
+ *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
+ */
+
+#include <string>
+#include <vector>
+
+/** @class DCPContentType
+ *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
+ */
+class DCPContentType
+{
+public:
+       DCPContentType (std::string, std::string);
+
+       /** @return user-visible `pretty' name */
+       std::string pretty_name () const {
+               return _pretty_name;
+       }
+
+       /** @return name as understood by OpenDCP */
+       std::string opendcp_name () const {
+               return _opendcp_name;
+       }
+
+       static DCPContentType const * from_pretty_name (std::string);
+       static DCPContentType const * from_index (int);
+       static int as_index (DCPContentType const *);
+       static std::vector<DCPContentType const *> all ();
+       static void setup_dcp_content_types ();
+
+private:
+       std::string _pretty_name;
+       std::string _opendcp_name;
+
+       /** All available DCP content types */
+       static std::vector<DCPContentType const *> _dcp_content_types;
+};
+     

diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
new file mode 100644 (file)
index 0000000..cbd7089
--- /dev/null
+++ b/src/lib/dcp_video_frame.cc
@@ -0,0 +1,433 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/dcp_video_frame.cc
+ *  @brief A single frame of video destined for a DCP.
+ *
+ *  Given an Image and some settings, this class knows how to encode
+ *  the image to J2K either on the local host or on a remote server.
+ *
+ *  Objects of this class are used for the queue that we keep
+ *  of images that require encoding.
+ */
+
+#include <stdint.h>
+#include <cstring>
+#include <cstdlib>
+#include <stdexcept>
+#include <cstdio>
+#include <iomanip>
+#include <sstream>
+#include <iostream>
+#include <unistd.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <boost/filesystem.hpp>
+#include "film.h"
+#include "dcp_video_frame.h"
+#include "lut.h"
+#include "config.h"
+#include "film_state.h"
+#include "options.h"
+#include "exceptions.h"
+#include "server.h"
+#include "util.h"
+#include "scaler.h"
+#include "image.h"
+#include "log.h"
+
+#ifdef DEBUG_HASH
+#include <mhash.h>
+#endif
+
+using namespace std;
+using namespace boost;
+
+/** Construct a DCP video frame.
+ *  @param input Input image.
+ *  @param out Required size of output, in pixels (including any padding).
+ *  @param s Scaler to use.
+ *  @param p Number of pixels of padding either side of the image.
+ *  @param f Index of the frame within the Film.
+ *  @param fps Frames per second of the Film.
+ *  @param pp FFmpeg post-processing string to use.
+ *  @param clut Colour look-up table to use (see Config::colour_lut_index ())
+ *  @param bw J2K bandwidth to use (see Config::j2k_bandwidth ())
+ *  @param l Log to write to.
+ */
+DCPVideoFrame::DCPVideoFrame (
+       shared_ptr<Image> yuv, Size out, int p, Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l)
+       : _input (yuv)
+       , _out_size (out)
+       , _padding (p)
+       , _scaler (s)
+       , _frame (f)
+         /* we round here; not sure if this is right */
+       , _frames_per_second (rint (fps))
+       , _post_process (pp)
+       , _colour_lut_index (clut)
+       , _j2k_bandwidth (bw)
+       , _log (l)
+       , _image (0)
+       , _parameters (0)
+       , _cinfo (0)
+       , _cio (0)
+{
+       
+}
+
+/** Create a libopenjpeg container suitable for our output image */
+void
+DCPVideoFrame::create_openjpeg_container ()
+{
+       for (int i = 0; i < 3; ++i) {
+               _cmptparm[i].dx = 1;
+               _cmptparm[i].dy = 1;
+               _cmptparm[i].w = _out_size.width;
+               _cmptparm[i].h = _out_size.height;
+               _cmptparm[i].x0 = 0;
+               _cmptparm[i].y0 = 0;
+               _cmptparm[i].prec = 12;
+               _cmptparm[i].bpp = 12;
+               _cmptparm[i].sgnd = 0;
+       }
+
+       _image = opj_image_create (3, &_cmptparm[0], CLRSPC_SRGB);
+       if (_image == 0) {
+               throw EncodeError ("could not create libopenjpeg image");
+       }
+
+       _image->x0 = 0;
+       _image->y0 = 0;
+       _image->x1 = _out_size.width;
+       _image->y1 = _out_size.height;
+}
+
+DCPVideoFrame::~DCPVideoFrame ()
+{
+       if (_image) {
+               opj_image_destroy (_image);
+       }
+
+       if (_cio) {
+               opj_cio_close (_cio);
+       }
+
+       if (_cinfo) {
+               opj_destroy_compress (_cinfo);
+       }
+
+       if (_parameters) {
+               free (_parameters->cp_comment);
+               free (_parameters->cp_matrice);
+       }
+       
+       delete _parameters;
+}
+
+/** J2K-encode this frame on the local host.
+ *  @return Encoded data.
+ */
+shared_ptr<EncodedData>
+DCPVideoFrame::encode_locally ()
+{
+       shared_ptr<Image> prepared = _input;
+       
+       if (!_post_process.empty ()) {
+               prepared = prepared->post_process (_post_process);
+       }
+       
+       prepared = prepared->scale_and_convert_to_rgb (_out_size, _padding, _scaler);
+
+       create_openjpeg_container ();
+
+       int const size = _out_size.width * _out_size.height;
+
+       struct {
+               double r, g, b;
+       } s;
+
+       struct {
+               double x, y, z;
+       } d;
+
+       /* Copy our RGB into the openjpeg container, converting to XYZ in the process */
+
+       uint8_t* p = prepared->data()[0];
+       for (int i = 0; i < size; ++i) {
+               /* In gamma LUT (converting 8-bit input to 12-bit) */
+               s.r = lut_in[_colour_lut_index][*p++ << 4];
+               s.g = lut_in[_colour_lut_index][*p++ << 4];
+               s.b = lut_in[_colour_lut_index][*p++ << 4];
+
+               /* RGB to XYZ Matrix */
+               d.x = ((s.r * color_matrix[_colour_lut_index][0][0]) + (s.g * color_matrix[_colour_lut_index][0][1]) + (s.b * color_matrix[_colour_lut_index][0][2]));
+               d.y = ((s.r * color_matrix[_colour_lut_index][1][0]) + (s.g * color_matrix[_colour_lut_index][1][1]) + (s.b * color_matrix[_colour_lut_index][1][2]));
+               d.z = ((s.r * color_matrix[_colour_lut_index][2][0]) + (s.g * color_matrix[_colour_lut_index][2][1]) + (s.b * color_matrix[_colour_lut_index][2][2]));
+                                                                                            
+               /* DCI companding */
+               d.x = d.x * DCI_COEFFICENT * (DCI_LUT_SIZE - 1);
+               d.y = d.y * DCI_COEFFICENT * (DCI_LUT_SIZE - 1);
+               d.z = d.z * DCI_COEFFICENT * (DCI_LUT_SIZE - 1);
+
+               /* Out gamma LUT */
+               _image->comps[0].data[i] = lut_out[LO_DCI][(int) d.x];
+               _image->comps[1].data[i] = lut_out[LO_DCI][(int) d.y];
+               _image->comps[2].data[i] = lut_out[LO_DCI][(int) d.z];
+       }
+
+       /* Set the max image and component sizes based on frame_rate */
+       int const max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second;
+       int const max_comp_size = max_cs_len / 1.25;
+
+       /* Set encoding parameters to default values */
+       _parameters = new opj_cparameters_t;
+       opj_set_default_encoder_parameters (_parameters);
+
+       /* Set default cinema parameters */
+       _parameters->tile_size_on = false;
+       _parameters->cp_tdx = 1;
+       _parameters->cp_tdy = 1;
+       
+       /* Tile part */
+       _parameters->tp_flag = 'C';
+       _parameters->tp_on = 1;
+       
+       /* Tile and Image shall be at (0,0) */
+       _parameters->cp_tx0 = 0;
+       _parameters->cp_ty0 = 0;
+       _parameters->image_offset_x0 = 0;
+       _parameters->image_offset_y0 = 0;
+
+       /* Codeblock size = 32x32 */
+       _parameters->cblockw_init = 32;
+       _parameters->cblockh_init = 32;
+       _parameters->csty |= 0x01;
+       
+       /* The progression order shall be CPRL */
+       _parameters->prog_order = CPRL;
+       
+       /* No ROI */
+       _parameters->roi_compno = -1;
+       
+       _parameters->subsampling_dx = 1;
+       _parameters->subsampling_dy = 1;
+       
+       /* 9-7 transform */
+       _parameters->irreversible = 1;
+       
+       _parameters->tcp_rates[0] = 0;
+       _parameters->tcp_numlayers++;
+       _parameters->cp_disto_alloc = 1;
+       _parameters->cp_rsiz = CINEMA2K;
+       _parameters->cp_comment = strdup ("OpenDCP");
+       _parameters->cp_cinema = CINEMA2K_24;
+
+       /* 3 components, so use MCT */
+       _parameters->tcp_mct = 1;
+       
+       /* set max image */
+       _parameters->max_comp_size = max_comp_size;
+       _parameters->tcp_rates[0] = ((float) (3 * _image->comps[0].w * _image->comps[0].h * _image->comps[0].prec)) / (max_cs_len * 8);
+
+       /* get a J2K compressor handle */
+       _cinfo = opj_create_compress (CODEC_J2K);
+
+       /* Set event manager to null (openjpeg 1.3 bug) */
+       _cinfo->event_mgr = 0;
+
+#ifdef DEBUG_HASH
+       md5_data ("J2K in X", _image->comps[0].data, size * sizeof (int));
+       md5_data ("J2K in Y", _image->comps[1].data, size * sizeof (int));
+       md5_data ("J2K in Z", _image->comps[2].data, size * sizeof (int));
+#endif 
+       
+       /* Setup the encoder parameters using the current image and user parameters */
+       opj_setup_encoder (_cinfo, _parameters, _image);
+
+       _cio = opj_cio_open ((opj_common_ptr) _cinfo, 0, 0);
+
+       int const r = opj_encode (_cinfo, _cio, _image, 0);
+       if (r == 0) {
+               throw EncodeError ("jpeg2000 encoding failed");
+       }
+
+#ifdef DEBUG_HASH
+       md5_data ("J2K out", _cio->buffer, cio_tell (_cio));
+#endif 
+
+       {
+               stringstream s;
+               s << "Finished locally-encoded frame " << _frame << " length " << cio_tell (_cio);
+               _log->log (s.str ());
+       }
+       
+       return shared_ptr<EncodedData> (new LocallyEncodedData (_cio->buffer, cio_tell (_cio)));
+}
+
+/** Send this frame to a remote server for J2K encoding, then read the result.
+ *  @param serv Server to send to.
+ *  @return Encoded data.
+ */
+shared_ptr<EncodedData>
+DCPVideoFrame::encode_remotely (Server const * serv)
+{
+       int const fd = socket (AF_INET, SOCK_STREAM, 0);
+       if (fd < 0) {
+               throw NetworkError ("could not create socket");
+       }
+
+       struct timeval tv;
+       tv.tv_sec = 20;
+       tv.tv_usec = 0;
+       
+       if (setsockopt (fd, SOL_SOCKET, SO_RCVTIMEO, (void *) &tv, sizeof (tv)) < 0) {
+               close (fd);
+               throw NetworkError ("setsockopt failed");
+       }
+
+       if (setsockopt (fd, SOL_SOCKET, SO_SNDTIMEO, (void *) &tv, sizeof (tv)) < 0) {
+               close (fd);
+               throw NetworkError ("setsockopt failed");
+       }
+       
+       struct hostent* server = gethostbyname (serv->host_name().c_str ());
+       if (server == 0) {
+               close (fd);
+               throw NetworkError ("gethostbyname failed");
+       }
+
+       struct sockaddr_in server_address;
+       memset (&server_address, 0, sizeof (server_address));
+       server_address.sin_family = AF_INET;
+       memcpy (&server_address.sin_addr.s_addr, server->h_addr, server->h_length);
+       server_address.sin_port = htons (Config::instance()->server_port ());
+       if (connect (fd, (struct sockaddr *) &server_address, sizeof (server_address)) < 0) {
+               close (fd);
+               stringstream s;
+               s << "could not connect (" << strerror (errno) << ")";
+               throw NetworkError (s.str());
+       }
+
+#ifdef DEBUG_HASH
+       _input->hash ("Input for remote encoding (before sending)");
+#endif
+
+       stringstream s;
+       s << "encode "
+         << _input->size().width << " " << _input->size().height << " "
+         << _input->pixel_format() << " "
+         << _out_size.width << " " << _out_size.height << " "
+         << _padding << " "
+         << _scaler->id () << " "
+         << _frame << " "
+         << _frames_per_second << " "
+         << (_post_process.empty() ? "none" : _post_process) << " "
+         << Config::instance()->colour_lut_index () << " "
+         << Config::instance()->j2k_bandwidth () << " ";
+
+       for (int i = 0; i < _input->components(); ++i) {
+               s << _input->line_size()[i] << " ";
+       }
+
+       socket_write (fd, (uint8_t *) s.str().c_str(), s.str().length() + 1);
+
+       for (int i = 0; i < _input->components(); ++i) {
+               socket_write (fd, _input->data()[i], _input->line_size()[i] * _input->lines(i));
+       }
+
+       SocketReader reader (fd);
+
+       char buffer[32];
+       reader.read_indefinite ((uint8_t *) buffer, sizeof (buffer));
+       reader.consume (strlen (buffer) + 1);
+       shared_ptr<EncodedData> e (new RemotelyEncodedData (atoi (buffer)));
+
+       /* now read the rest */
+       reader.read_definite_and_consume (e->data(), e->size());
+
+#ifdef DEBUG_HASH
+       e->hash ("Encoded image (after receiving)");
+#endif
+
+       {
+               stringstream s;
+               s << "Finished remotely-encoded frame " << _frame << " length " << e->size();
+               _log->log (s.str ());
+       }
+       
+       close (fd);
+       return e;
+}
+
+/** Write this data to a J2K file.
+ *  @param opt Options.
+ *  @param frame Frame index.
+ */
+void
+EncodedData::write (shared_ptr<const Options> opt, int frame)
+{
+       string const tmp_j2k = opt->frame_out_path (frame, true);
+
+       FILE* f = fopen (tmp_j2k.c_str (), "wb");
+       
+       if (!f) {
+               throw WriteFileError (tmp_j2k, errno);
+       }
+
+       fwrite (_data, 1, _size, f);
+       fclose (f);
+
+       /* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */
+       filesystem::rename (tmp_j2k, opt->frame_out_path (frame, false));
+}
+
+/** Send this data to a file descriptor.
+ *  @param fd File descriptor.
+ */
+void
+EncodedData::send (int fd)
+{
+       stringstream s;
+       s << _size;
+       socket_write (fd, (uint8_t *) s.str().c_str(), s.str().length() + 1);
+       socket_write (fd, _data, _size);
+}
+
+#ifdef DEBUG_HASH
+void
+EncodedData::hash (string n) const
+{
+       md5_data (n, _data, _size);
+}
+#endif         
+
+/** @param s Size of data in bytes */
+RemotelyEncodedData::RemotelyEncodedData (int s)
+       : EncodedData (new uint8_t[s], s)
+{
+
+}
+
+RemotelyEncodedData::~RemotelyEncodedData ()
+{
+       delete[] _data;
+}

diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h
new file mode 100644 (file)
index 0000000..26b44ad
--- /dev/null
+++ b/src/lib/dcp_video_frame.h
@@ -0,0 +1,143 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <openjpeg.h>
+#include "util.h"
+
+/** @file  src/dcp_video_frame.h
+ *  @brief A single frame of video destined for a DCP.
+ */
+
+class FilmState;
+class Options;
+class Server;
+class Scaler;
+class Image;
+class Log;
+
+/** @class EncodedData
+ *  @brief Container for J2K-encoded data.
+ */
+class EncodedData
+{
+public:
+       /** @param d Data (will not be freed by this class, but may be by subclasses)
+        *  @param s Size of data, in bytes.
+        */
+       EncodedData (uint8_t* d, int s)
+               : _data (d)
+               , _size (s)
+       {}
+
+       virtual ~EncodedData () {}
+
+       void send (int);
+       void write (boost::shared_ptr<const Options>, int);
+
+#ifdef DEBUG_HASH
+       void hash (std::string) const;
+#endif 
+
+       /** @return data */
+       uint8_t* data () const {
+               return _data;
+       }
+
+       /** @return data size, in bytes */
+       int size () const {
+               return _size;
+       }
+
+protected:
+       uint8_t* _data; ///< data
+       int _size;      ///< data size in bytes
+};
+
+/** @class LocallyEncodedData
+ *  @brief EncodedData that was encoded locally; this class
+ *  just keeps a pointer to the data, but does no memory
+ *  management.
+ */
+class LocallyEncodedData : public EncodedData
+{
+public:
+       /** @param d Data (which will not be freed by this class)
+        *  @param s Size of data, in bytes.
+        */
+       LocallyEncodedData (uint8_t* d, int s)
+               : EncodedData (d, s)
+       {}
+};
+
+/** @class RemotelyEncodedData
+ *  @brief EncodedData that is being read from a remote server;
+ *  this class allocates and manages memory for the data.
+ */
+class RemotelyEncodedData : public EncodedData
+{
+public:
+       RemotelyEncodedData (int s);
+       ~RemotelyEncodedData ();
+};
+
+/** @class DCPVideoFrame
+ *  @brief A single frame of video destined for a DCP.
+ *
+ *  Given an Image and some settings, this class knows how to encode
+ *  the image to J2K either on the local host or on a remote server.
+ *
+ *  Objects of this class are used for the queue that we keep
+ *  of images that require encoding.
+ */
+class DCPVideoFrame
+{
+public:
+       DCPVideoFrame (boost::shared_ptr<Image>, Size, int, Scaler const *, int, float, std::string, int, int, Log *);
+       virtual ~DCPVideoFrame ();
+
+       boost::shared_ptr<EncodedData> encode_locally ();
+       boost::shared_ptr<EncodedData> encode_remotely (Server const *);
+
+       int frame () const {
+               return _frame;
+       }
+       
+private:
+       void create_openjpeg_container ();
+       void write_encoded (boost::shared_ptr<const Options>, uint8_t *, int);
+
+       boost::shared_ptr<Image> _input; ///< the input image
+       Size _out_size;                  ///< the required size of the output, in pixels
+       int _padding;
+       Scaler const * _scaler;          ///< scaler to use
+       int _frame;                      ///< frame index within the Film
+       int _frames_per_second;          ///< Frames per second that we will use for the DCP (rounded)
+       std::string _post_process;       ///< FFmpeg post-processing string to use
+       int _colour_lut_index;           ///< Colour look-up table to use (see Config::colour_lut_index ())
+       int _j2k_bandwidth;              ///< J2K bandwidth to use (see Config::j2k_bandwidth ())
+
+       Log* _log; ///< log
+
+       opj_image_cmptparm_t _cmptparm[3]; ///< libopenjpeg's opj_image_cmptparm_t
+       opj_image* _image;                 ///< libopenjpeg's image container 
+       opj_cparameters_t* _parameters;    ///< libopenjpeg's parameters
+       opj_cinfo_t* _cinfo;               ///< libopenjpeg's opj_cinfo_t
+       opj_cio_t* _cio;                   ///< libopenjpeg's opj_cio_t
+};

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
new file mode 100644 (file)
index 0000000..a904e08
--- /dev/null
+++ b/src/lib/decoder.cc
@@ -0,0 +1,300 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/decoder.cc
+ *  @brief Parent class for decoders of content.
+ */
+
+#include <iostream>
+#include <stdint.h>
+extern "C" {
+#include <libavfilter/avfiltergraph.h>
+#include <libavfilter/buffersink.h>
+#include <libavfilter/avcodec.h>
+}
+#include "film.h"
+#include "format.h"
+#include "job.h"
+#include "film_state.h"
+#include "options.h"
+#include "exceptions.h"
+#include "image.h"
+#include "util.h"
+#include "log.h"
+#include "decoder.h"
+#include "filter.h"
+#include "delay_line.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param s FilmState of the Film.
+ *  @param o Options.
+ *  @param j Job that we are running within, or 0
+ *  @param l Log to use.
+ *  @param minimal true to do the bare minimum of work; just run through the content.  Useful for acquiring
+ *  accurate frame counts as quickly as possible.  This generates no video or audio output.
+ *  @param ignore_length Ignore the content's claimed length when computing progress.
+ */
+Decoder::Decoder (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Job* j, Log* l, bool minimal, bool ignore_length)
+       : _fs (s)
+       , _opt (o)
+       , _job (j)
+       , _log (l)
+       , _minimal (minimal)
+       , _ignore_length (ignore_length)
+       , _video_frame (0)
+       , _buffer_src_context (0)
+       , _buffer_sink_context (0)
+       , _have_setup_video_filters (false)
+       , _delay_line (0)
+       , _delay_in_bytes (0)
+{
+       if (_opt->decode_video_frequency != 0 && _fs->length == 0) {
+               throw DecodeError ("cannot do a partial decode if length == 0");
+       }
+}
+
+Decoder::~Decoder ()
+{
+       delete _delay_line;
+}
+
+void
+Decoder::process_begin ()
+{
+       /* This assumes 2 bytes per sample */
+       _delay_in_bytes = _fs->audio_delay * _fs->audio_sample_rate * _fs->audio_channels * 2 / 1000;
+       delete _delay_line;
+       _delay_line = new DelayLine (_delay_in_bytes);
+}
+
+void
+Decoder::process_end ()
+{
+       if (_delay_in_bytes < 0) {
+               uint8_t remainder[-_delay_in_bytes];
+               _delay_line->get_remaining (remainder);
+               Audio (remainder, _delay_in_bytes);
+       }
+}
+
+/** Start decoding */
+void
+Decoder::go ()
+{
+       process_begin ();
+
+       if (_job && _ignore_length) {
+               _job->set_progress_unknown ();
+       }
+
+       while (pass () == false) {
+               if (_job && !_ignore_length) {
+                       _job->set_progress (float (_video_frame) / decoding_frames ());
+               }
+       }
+
+       process_end ();
+}
+
+/** @return Number of frames that we will be decoding */
+int
+Decoder::decoding_frames () const
+{
+       if (_opt->num_frames > 0) {
+               return _opt->num_frames;
+       }
+       
+       return _fs->length;
+}
+
+/** Run one pass.  This may or may not generate any actual video / audio data;
+ *  some decoders may require several passes to generate a single frame.
+ *  @return true if we have finished processing all data; otherwise false.
+ */
+bool
+Decoder::pass ()
+{
+       if (!_have_setup_video_filters) {
+               setup_video_filters ();
+               _have_setup_video_filters = true;
+       }
+       
+       if (_opt->num_frames != 0 && _video_frame >= _opt->num_frames) {
+               return true;
+       }
+
+       return do_pass ();
+}
+
+/** Called by subclasses to tell the world that some audio data is ready */
+void
+Decoder::process_audio (uint8_t* data, int channels, int size)
+{
+       if (_fs->audio_gain != 0) {
+               float const linear_gain = pow (10, _fs->audio_gain / 20);
+               uint8_t* p = data;
+               int const samples = size / 2;
+               switch (_fs->audio_sample_format) {
+               case AV_SAMPLE_FMT_S16:
+                       for (int i = 0; i < samples; ++i) {
+                               /* XXX: assumes little-endian; also we should probably be dithering here */
+                               int const ou = p[0] | (p[1] << 8);
+                               int const os = ou >= 0x8000 ? (- 0x10000 + ou) : ou;
+                               int const gs = int (os * linear_gain);
+                               int const gu = gs > 0 ? gs : (0x10000 + gs);
+                               p[0] = gu & 0xff;
+                               p[1] = (gu & 0xff00) >> 8;
+                               p += 2;
+                       }
+                       break;
+               default:
+                       assert (false);
+               }
+       }
+
+       int available = _delay_line->feed (data, size);
+       Audio (data, available);
+}
+
+/** Called by subclasses to tell the world that some video data is ready.
+ *  We do some post-processing / filtering then emit it for listeners.
+ *  @param frame to decode; caller manages memory.
+ */
+void
+Decoder::process_video (AVFrame* frame)
+{
+       if (_minimal) {
+               ++_video_frame;
+               return;
+       }
+
+       /* Use FilmState::length here as our one may be wrong */
+
+       int gap = 0;
+       if (_opt->decode_video_frequency != 0) {
+               gap = _fs->length / _opt->decode_video_frequency;
+       }
+       
+       if (_opt->decode_video_frequency != 0 && gap != 0 && (_video_frame % gap) != 0) {
+               ++_video_frame;
+               return;
+       }
+
+       if (av_vsrc_buffer_add_frame (_buffer_src_context, frame, 0) < 0) {
+               throw DecodeError ("could not push buffer into filter chain.");
+       }
+       
+       while (avfilter_poll_frame (_buffer_sink_context->inputs[0])) {
+               AVFilterBufferRef* filter_buffer;
+               if (av_buffersink_get_buffer_ref (_buffer_sink_context, &filter_buffer, 0) >= 0) {
+                       
+                       /* This takes ownership of filter_buffer */
+                       shared_ptr<Image> image (new FilterBufferImage ((PixelFormat) frame->format, filter_buffer));
+
+                       if (_opt->black_after > 0 && _video_frame > _opt->black_after) {
+                               image->make_black ();
+                       }
+
+                       Video (image, _video_frame);
+                       ++_video_frame;
+               }
+       }
+}
+
+void
+Decoder::setup_video_filters ()
+{
+       stringstream fs;
+       Size size_after_crop;
+       
+       if (_opt->apply_crop) {
+               size_after_crop = _fs->cropped_size (native_size ());
+               fs << crop_string (Position (_fs->left_crop, _fs->top_crop), size_after_crop);
+       } else {
+               size_after_crop = native_size ();
+               fs << crop_string (Position (0, 0), size_after_crop);
+       }
+
+       string filters = Filter::ffmpeg_strings (_fs->filters).first;
+       if (!filters.empty ()) {
+               filters += ",";
+       }
+
+       filters += fs.str ();
+
+       avfilter_register_all ();
+       
+       AVFilterGraph* graph = avfilter_graph_alloc();
+       if (graph == 0) {
+               throw DecodeError ("Could not create filter graph.");
+       }
+       
+       AVFilter* buffer_src = avfilter_get_by_name("buffer");
+       if (buffer_src == 0) {
+               throw DecodeError ("Could not create buffer src filter");
+       }
+       
+       AVFilter* buffer_sink = avfilter_get_by_name("buffersink");
+       if (buffer_sink == 0) {
+               throw DecodeError ("Could not create buffer sink filter");
+       }
+       
+       stringstream a;
+       a << native_size().width << ":"
+         << native_size().height << ":"
+         << pixel_format() << ":"
+         << time_base_numerator() << ":"
+         << time_base_denominator() << ":"
+         << sample_aspect_ratio_numerator() << ":"
+         << sample_aspect_ratio_denominator();
+
+       int r;
+       if ((r = avfilter_graph_create_filter (&_buffer_src_context, buffer_src, "in", a.str().c_str(), 0, graph)) < 0) {
+               throw DecodeError ("could not create buffer source");
+       }
+
+       enum PixelFormat pixel_formats[] = { pixel_format(), PIX_FMT_NONE };
+       if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, "out", 0, pixel_formats, graph) < 0) {
+               throw DecodeError ("could not create buffer sink.");
+       }
+
+       AVFilterInOut* outputs = avfilter_inout_alloc ();
+       outputs->name = av_strdup("in");
+       outputs->filter_ctx = _buffer_src_context;
+       outputs->pad_idx = 0;
+       outputs->next = 0;
+
+       AVFilterInOut* inputs = avfilter_inout_alloc ();
+       inputs->name = av_strdup("out");
+       inputs->filter_ctx = _buffer_sink_context;
+       inputs->pad_idx = 0;
+       inputs->next = 0;
+
+       _log->log ("Using filter chain `" + filters + "'");
+       if (avfilter_graph_parse (graph, filters.c_str(), &inputs, &outputs, 0) < 0) {
+               throw DecodeError ("could not set up filter graph.");
+       }
+
+       if (avfilter_graph_config (graph, 0) < 0) {
+               throw DecodeError ("could not configure filter graph.");
+       }
+}
+

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
new file mode 100644 (file)
index 0000000..db51879
--- /dev/null
+++ b/src/lib/decoder.h
@@ -0,0 +1,136 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/decoder.h
+ *  @brief Parent class for decoders of content.
+ */
+
+#ifndef DVDOMATIC_DECODER_H
+#define DVDOMATIC_DECODER_H
+
+#include <vector>
+#include <string>
+#include <stdint.h>
+#include <boost/shared_ptr.hpp>
+#include <sigc++/sigc++.h>
+#include "util.h"
+
+class Job;
+class FilmState;
+class Options;
+class Image;
+class Log;
+class DelayLine;
+
+/** @class Decoder.
+ *  @brief Parent class for decoders of content.
+ *
+ *  These classes can be instructed run through their content
+ *  (by calling ::go), and they emit signals when video or audio data is ready for something else
+ *  to process.
+ */
+class Decoder
+{
+public:
+       Decoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+       virtual ~Decoder ();
+
+       /* Methods to query our input video */
+
+       /** @return length in video frames */
+       virtual int length_in_frames () const = 0;
+       /** @return video frames per second, or 0 if unknown */
+       virtual float frames_per_second () const = 0;
+       /** @return native size in pixels */
+       virtual Size native_size () const = 0;
+       /** @return number of audio channels */
+       virtual int audio_channels () const = 0;
+       /** @return audio sampling rate in Hz */
+       virtual int audio_sample_rate () const = 0;
+       /** @return format of audio samples */
+       virtual AVSampleFormat audio_sample_format () const = 0;
+
+       void process_begin ();
+       bool pass ();
+       void process_end ();
+       void go ();
+
+       /** @return the index of the last video frame to be processed */
+       int last_video_frame () const {
+               return _video_frame;
+       }
+       
+       int decoding_frames () const;
+
+       /** Emitted when a video frame is ready.
+        *  First parameter is the frame.
+        *  Second parameter is its index within the content.
+        */
+       sigc::signal<void, boost::shared_ptr<Image>, int> Video;
+
+       /** Emitted when some audio data is ready.
+        *  First parameter is the interleaved sample data, format is given in the FilmState.
+        *  Second parameter is the size of the data.
+        */
+       sigc::signal<void, uint8_t *, int> Audio;
+       
+protected:
+       /** perform a single pass at our content */
+       virtual bool do_pass () = 0;
+       virtual PixelFormat pixel_format () const = 0;
+       virtual int time_base_numerator () const = 0;
+       virtual int time_base_denominator () const = 0;
+       virtual int sample_aspect_ratio_numerator () const = 0;
+       virtual int sample_aspect_ratio_denominator () const = 0;
+       
+       void process_video (AVFrame *);
+       void process_audio (uint8_t *, int, int);
+
+       /** our FilmState */
+       boost::shared_ptr<const FilmState> _fs;
+       /** our options */
+       boost::shared_ptr<const Options> _opt;
+       /** associated Job, or 0 */
+       Job* _job;
+       /** log that we can write to */
+       Log* _log;
+
+       /** true to do the bare minimum of work; just run through the content.  Useful for acquiring
+        *  accurate frame counts as quickly as possible.  This generates no video or audio output.
+        */
+       bool _minimal;
+
+       /** ignore_length Ignore the content's claimed length when computing progress */
+       bool _ignore_length;
+
+private:
+       void setup_video_filters ();
+       
+       /** last video frame to be processed */
+       int _video_frame;
+
+       AVFilterContext* _buffer_src_context;
+       AVFilterContext* _buffer_sink_context;
+
+       bool _have_setup_video_filters;
+       DelayLine* _delay_line;
+       int _delay_in_bytes;
+};
+
+#endif

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
new file mode 100644 (file)
index 0000000..5f8fc55
--- /dev/null
+++ b/src/lib/decoder_factory.cc
@@ -0,0 +1,48 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/decoder_factory.cc
+ *  @brief A method to create an appropriate decoder for some content.
+ */
+
+#include <boost/filesystem.hpp>
+#include "ffmpeg_decoder.h"
+#include "tiff_decoder.h"
+#include "imagemagick_decoder.h"
+#include "film_state.h"
+
+using namespace std;
+using namespace boost;
+
+shared_ptr<Decoder>
+decoder_factory (
+       shared_ptr<const FilmState> fs, shared_ptr<const Options> o, Job* j, Log* l, bool minimal = false, bool ignore_length = false
+       )
+{
+       if (filesystem::is_directory (fs->content_path ())) {
+               /* Assume a directory contains TIFFs */
+               return shared_ptr<Decoder> (new TIFFDecoder (fs, o, j, l, minimal, ignore_length));
+       }
+
+       if (fs->content_type() == STILL) {
+               return shared_ptr<Decoder> (new ImageMagickDecoder (fs, o, j, l, minimal, ignore_length));
+       }
+       
+       return shared_ptr<Decoder> (new FFmpegDecoder (fs, o, j, l, minimal, ignore_length));
+}

diff --git a/src/lib/decoder_factory.h b/src/lib/decoder_factory.h
new file mode 100644 (file)
index 0000000..36c1495
--- /dev/null
+++ b/src/lib/decoder_factory.h
@@ -0,0 +1,32 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/decoder_factory.h
+ *  @brief A method to create an appropriate decoder for some content.
+ */
+
+class Decoder;
+class FilmState;
+class Options;
+class Job;
+class Log;
+
+extern boost::shared_ptr<Decoder> decoder_factory (
+       boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool minimal = false, bool ignore_length = false
+       );

diff --git a/src/lib/delay_line.cc b/src/lib/delay_line.cc
new file mode 100644 (file)
index 0000000..c510fb4
--- /dev/null
+++ b/src/lib/delay_line.cc
@@ -0,0 +1,110 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <stdint.h>
+#include <cstring>
+#include <algorithm>
+#include <iostream>
+#include "delay_line.h"
+
+using namespace std;
+
+/** Construct a DelayLine delaying by some number of bytes.
+ *  @param d Number of bytes to delay by; +ve moves data later.
+ */
+DelayLine::DelayLine (int d)
+       : _delay (d)
+       , _buffer (0)
+       , _negative_delay_remaining (0)
+{
+       if (d > 0) {
+               /* We need a buffer to keep some data in */
+               _buffer = new uint8_t[d];
+               memset (_buffer, 0, d);
+       } else if (d < 0) {
+               /* We can do -ve delays just by chopping off
+                  the start, so no buffer needed.
+               */
+               _negative_delay_remaining = -d;
+       }
+}
+
+DelayLine::~DelayLine ()
+{
+       delete[] _buffer;
+}
+
+int
+DelayLine::feed (uint8_t* data, int size)
+{
+       int available = size;
+
+       if (_delay > 0) {
+               
+               /* Copy the input data */
+               uint8_t input[size];
+               memcpy (input, data, size);
+
+               int to_do = size;
+
+               /* Write some of our buffer to the output */
+               int const from_buffer = min (to_do, _delay);
+               memcpy (data, _buffer, from_buffer);
+               to_do -= from_buffer;
+
+               /* Write some of the input to the output */
+               int const from_input = min (to_do, size);
+               memcpy (data + from_buffer, input, from_input);
+
+               int const left_in_buffer = _delay - from_buffer;
+               
+               /* Shuffle our buffer down */
+               memmove (_buffer, _buffer + from_buffer, left_in_buffer);
+
+               /* Copy remaining input data to our buffer */
+               memcpy (_buffer + left_in_buffer, input + from_input, size - from_input);
+
+       } else if (_delay < 0) {
+
+               /* Chop the initial data off until _negative_delay_remaining
+                  is zero, then just pass data.
+               */
+
+               int const to_do = min (size, _negative_delay_remaining);
+               available = size - to_do;
+               memmove (data, data + to_do, available);
+               _negative_delay_remaining -= to_do;
+
+       }
+
+       return available;
+}
+
+/** With -ve delays, the DelayLine will have data to give after
+ *  all input data has been passed to ::feed().
+ *  Call this method after passing all input data.
+ *
+ *  @param buffer Pointer to buffer of _delay bytes in length,
+ *  which will be filled with remaining data.
+ */
+void
+DelayLine::get_remaining (uint8_t* buffer)
+{
+       memset (buffer, 0, -_delay);
+}

diff --git a/src/lib/delay_line.h b/src/lib/delay_line.h
new file mode 100644 (file)
index 0000000..377553d
--- /dev/null
+++ b/src/lib/delay_line.h
@@ -0,0 +1,36 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** A class which can be fed a stream of bytes and which can
+ *  delay them by a positive or negative amount.
+ */
+class DelayLine
+{
+public:
+       DelayLine (int);
+       ~DelayLine ();
+       
+       int feed (uint8_t *, int);
+       void get_remaining (uint8_t *);
+
+private:
+       int _delay; ///< delay in bytes, +ve to move data later
+       uint8_t* _buffer; ///< buffer for +ve delays, or 0
+       int _negative_delay_remaining; ///< number of bytes of negative delay that remain to emit
+};

diff --git a/src/lib/dvd.cc b/src/lib/dvd.cc
new file mode 100644 (file)
index 0000000..629ba1a
--- /dev/null
+++ b/src/lib/dvd.cc
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <fstream>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+
+using namespace std;
+using namespace boost;
+
+string
+find_dvd ()
+{
+       ifstream f ("/etc/mtab");
+       while (f.good ()) {
+               string s;
+               getline (f, s);
+               vector<string> b;
+               split (b, s, is_any_of (" "));
+               if (b.size() >= 3 && b[2] == "udf") {
+                       replace_all (b[1], "\\040", " ");
+                       return b[1];
+               }
+       }
+
+       return "";
+}
+
+vector<uint64_t>
+dvd_titles (string dvd)
+{
+       filesystem::path video (dvd);
+       video /= "VIDEO_TS";
+
+       vector<uint64_t> sizes;
+       
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (video); i != filesystem::directory_iterator(); ++i) {
+#if BOOST_FILESYSTEM_VERSION == 3              
+               string const n = filesystem::path(*i).filename().generic_string();
+#else          
+               string const n = filesystem::path(*i).filename();
+#endif
+               if (starts_with (n, "VTS_") && ends_with (n, ".VOB")) {
+                       uint64_t const size = filesystem::file_size (filesystem::path (*i));
+                       vector<string> p;
+                       split (p, n, is_any_of ("_."));
+                       if (p.size() == 4) {
+                               int const a = atoi (p[1].c_str ());
+                               int const b = atoi (p[2].c_str ());
+                               while (a >= int (sizes.size())) {
+                                       sizes.push_back (0);
+                               }
+
+                               if (b > 0) {
+                                       sizes[a] += size;
+                               }
+                       }
+               }
+       }
+                                       
+       return sizes;           
+}

diff --git a/src/lib/dvd.h b/src/lib/dvd.h
new file mode 100644 (file)
index 0000000..1704721
--- /dev/null
+++ b/src/lib/dvd.h
@@ -0,0 +1,21 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+extern std::vector<uint64_t> dvd_titles (std::string);
+extern std::string find_dvd ();

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
new file mode 100644 (file)
index 0000000..c8eb24c
--- /dev/null
+++ b/src/lib/encoder.cc
@@ -0,0 +1,71 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/encoder.h
+ *  @brief Parent class for classes which can encode video and audio frames.
+ */
+
+#include "encoder.h"
+#include "util.h"
+
+using namespace boost;
+
+int const Encoder::_history_size = 25;
+
+/** @param s FilmState of the film that we are encoding.
+ *  @param o Options.
+ *  @param l Log.
+ */
+Encoder::Encoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : _fs (s)
+       , _opt (o)
+       , _log (l)
+{
+
+}
+
+
+/** @return an estimate of the current number of frames we are encoding per second,
+ *  or 0 if not known.
+ */
+float
+Encoder::current_frames_per_second () const
+{
+       boost::mutex::scoped_lock lock (_history_mutex);
+       if (int (_time_history.size()) < _history_size) {
+               return 0;
+       }
+
+       struct timeval now;
+       gettimeofday (&now, 0);
+
+       return _history_size / (seconds (now) - seconds (_time_history.back ()));
+}
+
+void
+Encoder::frame_done ()
+{
+       boost::mutex::scoped_lock lock (_history_mutex);
+       struct timeval tv;
+       gettimeofday (&tv, 0);
+       _time_history.push_front (tv);
+       if (int (_time_history.size()) > _history_size) {
+               _time_history.pop_back ();
+       }
+}

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
new file mode 100644 (file)
index 0000000..bed2c09
--- /dev/null
+++ b/src/lib/encoder.h
@@ -0,0 +1,87 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef DVDOMATIC_ENCODER_H
+#define DVDOMATIC_ENCODER_H
+
+/** @file src/encoder.h
+ *  @brief Parent class for classes which can encode video and audio frames.
+ */
+
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <list>
+#include <stdint.h>
+
+class FilmState;
+class Options;
+class Image;
+class Log;
+
+/** @class Encoder
+ *  @brief Parent class for classes which can encode video and audio frames.
+ *
+ *  Video is supplied to process_video as YUV frames, and audio
+ *  is supplied as uncompressed PCM in blocks of various sizes.
+ *
+ *  The subclass is expected to encode the video and/or audio in
+ *  some way and write it to disk.
+ */
+
+class Encoder
+{
+public:
+       Encoder (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+
+       /** Called to indicate that a processing run is about to begin */
+       virtual void process_begin () = 0;
+
+       /** Called with a frame of video.
+        *  @param i Video frame image.
+        *  @param f Frame number within the film.
+        */
+       virtual void process_video (boost::shared_ptr<Image> i, int f) = 0;
+
+       /** Called with some audio data.
+        *  @param d Data.
+        *  @param s Size of data (in bytes)
+        */
+       virtual void process_audio (uint8_t* d, int s) = 0;
+
+       /** Called when a processing run has finished */
+       virtual void process_end () = 0;
+
+       float current_frames_per_second () const;
+
+protected:
+       void frame_done ();
+       
+       /** FilmState of the film that we are encoding */
+       boost::shared_ptr<const FilmState> _fs;
+       /** Options */
+       boost::shared_ptr<const Options> _opt;
+       /** Log */
+       Log* _log;
+
+       mutable boost::mutex _history_mutex;
+       std::list<struct timeval> _time_history;
+       static int const _history_size;
+};
+
+#endif

diff --git a/src/lib/encoder_factory.cc b/src/lib/encoder_factory.cc
new file mode 100644 (file)
index 0000000..d16150f
--- /dev/null
+++ b/src/lib/encoder_factory.cc
@@ -0,0 +1,40 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/encoder_factory.cc
+ *  @brief A method to create an appropriate encoder for some content.
+ */
+
+#include <boost/filesystem.hpp>
+#include "j2k_wav_encoder.h"
+#include "j2k_still_encoder.h"
+#include "film_state.h"
+
+using namespace std;
+using namespace boost;
+
+shared_ptr<Encoder>
+encoder_factory (shared_ptr<const FilmState> fs, shared_ptr<const Options> o, Log* l)
+{
+       if (!filesystem::is_directory (fs->content_path()) && fs->content_type() == STILL) {
+               return shared_ptr<Encoder> (new J2KStillEncoder (fs, o, l));
+       }
+       
+       return shared_ptr<Encoder> (new J2KWAVEncoder (fs, o, l));
+}

diff --git a/src/lib/encoder_factory.h b/src/lib/encoder_factory.h
new file mode 100644 (file)
index 0000000..2803de6
--- /dev/null
+++ b/src/lib/encoder_factory.h
@@ -0,0 +1,30 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/encoder_factory.h
+ *  @brief A method to create an appropriate encoder for some content.
+ */
+
+class Encoder;
+class FilmState;
+class Options;
+class Job;
+class Log;
+
+extern boost::shared_ptr<Encoder> encoder_factory (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Log *);

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
new file mode 100644 (file)
index 0000000..6927715
--- /dev/null
+++ b/src/lib/examine_content_job.cc
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/examine_content_job.cc
+ *  @brief A class to run through content at high speed to find its length.
+ */
+
+#include "examine_content_job.h"
+#include "options.h"
+#include "film_state.h"
+#include "decoder_factory.h"
+#include "decoder.h"
+
+using namespace std;
+using namespace boost;
+
+ExamineContentJob::ExamineContentJob (shared_ptr<const FilmState> fs, Log* l)
+       : Job (fs, shared_ptr<Options> (), l)
+{
+
+}
+
+ExamineContentJob::~ExamineContentJob ()
+{
+}
+
+string
+ExamineContentJob::name () const
+{
+       stringstream s;
+       s << "Examine content of " << _fs->name;
+       return s.str ();
+}
+
+void
+ExamineContentJob::run ()
+{
+       shared_ptr<Options> o (new Options ("", "", ""));
+       o->out_size = Size (512, 512);
+       o->apply_crop = false;
+
+       _decoder = decoder_factory (_fs, o, this, _log, true, true);
+       _decoder->go ();
+       
+       set_progress (1);
+       set_state (FINISHED_OK);
+}
+
+int
+ExamineContentJob::last_video_frame () const
+{
+       return _decoder->last_video_frame ();
+}

diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
new file mode 100644 (file)
index 0000000..d149341
--- /dev/null
+++ b/src/lib/examine_content_job.h
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/examine_content_job.h
+ *  @brief A class to run through content at high speed to find its length.
+ */
+
+#include "job.h"
+
+class Decoder;
+
+/** @class ExamineContentJob
+ *  @brief A class to run through content at high speed to find its length.
+ */
+class ExamineContentJob : public Job
+{
+public:
+       ExamineContentJob (boost::shared_ptr<const FilmState>, Log *);
+       ~ExamineContentJob ();
+
+       std::string name () const;
+       void run ();
+
+       int last_video_frame () const;
+
+private:
+       boost::shared_ptr<Decoder> _decoder;
+};
+

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
new file mode 100644 (file)
index 0000000..b16275c
--- /dev/null
+++ b/src/lib/exceptions.h
@@ -0,0 +1,215 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/exceptions.h
+ *  @brief Our exceptions.
+ */
+
+#include <stdexcept>
+#include <sstream>
+#include <cstring>
+
+/** @class StringError
+ *  @brief A parent class for exceptions using messages held in a std::string
+ */
+class StringError : public std::exception
+{
+public:
+       /** @param w Error message */
+       StringError (std::string w) {
+               _what = w;
+       }
+
+       virtual ~StringError () throw () {}
+
+       /** @return error message */
+       char const * what () const throw () {
+               return _what.c_str ();
+       }
+
+protected:
+       /** error message */
+       std::string _what;
+};
+
+/** @class DecodeError
+ *  @brief A low-level problem with the decoder (possibly due to the nature
+ *  of a source file).
+ */
+class DecodeError : public StringError
+{
+public:
+       DecodeError (std::string s)
+               : StringError (s)
+       {}
+};
+
+/** @class EncodeError
+ *  @brief A low-level problem with an encoder.
+ */
+class EncodeError : public StringError
+{
+public:
+       EncodeError (std::string s)
+               : StringError (s)
+       {}
+};
+
+/** @class FileError.
+ *  @brief Parent class for file-related errors.
+ */
+class FileError : public StringError
+{
+public:
+       FileError (std::string m, std::string f)
+               : StringError (m)
+               , _file (f)
+       {}
+
+       virtual ~FileError () throw () {}
+
+       std::string file () const {
+               return _file;
+       }
+
+private:
+       std::string _file;
+};
+       
+
+/** @class OpenFileError.
+ *  @brief Indicates that some error occurred when trying to open a file.
+ */
+class OpenFileError : public FileError
+{
+public:
+       /** @param f File that we were trying to open */
+       OpenFileError (std::string f)
+               : FileError ("could not open file " + f, f)
+       {}
+};
+
+/** @class CreateFileError.
+ *  @brief Indicates that some error occurred when trying to create a file.
+ */
+class CreateFileError : public FileError
+{
+public:
+       /** @param f File that we were trying to create */
+       CreateFileError (std::string f)
+               : FileError ("could not create file " + f, f)
+       {}
+};
+
+/** @class WriteFileError.
+ *  @brief Indicates that some error occurred when trying to write to a file
+ */
+class WriteFileError : public FileError
+{
+public:
+       /** @param f File that we were trying to write to.
+        *  @param e errno value, or 0.
+        */
+       WriteFileError (std::string f, int e)
+               : FileError ("", f)
+       {
+               std::stringstream s;
+               s << "could not write to file " << f;
+               if (e) {
+                       s << " (" << strerror (e) << ")";
+               }
+               _what = s.str ();
+       }
+};
+
+/** @class SettingError.
+ *  @brief Indicates that something is wrong with a setting.
+ */
+class SettingError : public StringError
+{
+public:
+       /** @param s Name of setting that was required.
+        *  @param m Message.
+        */
+       SettingError (std::string s, std::string m)
+               : StringError (m)
+               , _setting (s)
+       {}
+
+       virtual ~SettingError () throw () {}
+
+       /** @return name of setting in question */
+       std::string setting () const {
+               return _setting;
+       }
+
+private:
+       std::string _setting;
+};
+
+/** @class MissingSettingError.
+ *  @brief Indicates that a Film is missing a setting that is required for some operation.
+ */
+class MissingSettingError : public SettingError
+{
+public:
+       /** @param s Name of setting that was required */
+       MissingSettingError (std::string s)
+               : SettingError (s, "missing required setting " + s)
+       {}
+};
+
+/** @class BadSettingError
+ *  @brief Indicates that a setting is bad in some way.
+ */
+class BadSettingError : public SettingError
+{
+public:
+       /** @param s Name of setting that is bad */
+       BadSettingError (std::string s, std::string m)
+               : SettingError (s, m)
+       {}
+};
+
+/** @class NetworkError.
+ *  @brief Indicates some problem with communication on the network.
+ */
+class NetworkError : public StringError
+{
+public:
+       NetworkError (std::string s)
+               : StringError (s)
+       {}
+};
+
+class PlayError : public StringError
+{
+public:
+       PlayError (std::string s)
+               : StringError (s)
+       {}
+};
+
+class DVDError : public StringError
+{
+public:
+       DVDError (std::string s)
+               : StringError (s)
+       {}
+};

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
new file mode 100644 (file)
index 0000000..af258f3
--- /dev/null
+++ b/src/lib/ffmpeg_decoder.cc
@@ -0,0 +1,256 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/ffmpeg_decoder.cc
+ *  @brief A decoder using FFmpeg to decode content.
+ */
+
+#include <stdexcept>
+#include <vector>
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+#include <stdint.h>
+extern "C" {
+#include <tiffio.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libpostproc/postprocess.h>
+}
+#include <sndfile.h>
+#include "film.h"
+#include "format.h"
+#include "transcoder.h"
+#include "job.h"
+#include "filter.h"
+#include "film_state.h"
+#include "options.h"
+#include "exceptions.h"
+#include "image.h"
+#include "util.h"
+#include "log.h"
+#include "ffmpeg_decoder.h"
+
+using namespace std;
+using namespace boost;
+
+FFmpegDecoder::FFmpegDecoder (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Job* j, Log* l, bool minimal, bool ignore_length)
+       : Decoder (s, o, j, l, minimal, ignore_length)
+       , _format_context (0)
+       , _video_stream (-1)
+       , _audio_stream (-1)
+       , _frame (0)
+       , _video_codec_context (0)
+       , _video_codec (0)
+       , _audio_codec_context (0)
+       , _audio_codec (0)
+{
+       setup_general ();
+       setup_video ();
+       setup_audio ();
+}
+
+FFmpegDecoder::~FFmpegDecoder ()
+{
+       if (_audio_codec_context) {
+               avcodec_close (_audio_codec_context);
+       }
+       
+       if (_video_codec_context) {
+               avcodec_close (_video_codec_context);
+       }
+       
+       av_free (_frame);
+       avformat_close_input (&_format_context);
+}      
+
+void
+FFmpegDecoder::setup_general ()
+{
+       int r;
+       
+       av_register_all ();
+
+       if ((r = avformat_open_input (&_format_context, _fs->content_path().c_str(), 0, 0)) != 0) {
+               throw OpenFileError (_fs->content_path ());
+       }
+
+       if (avformat_find_stream_info (_format_context, 0) < 0) {
+               throw DecodeError ("could not find stream information");
+       }
+
+       for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
+               if (_format_context->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+                       _video_stream = i;
+               } else if (_format_context->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+                       _audio_stream = i;
+               }
+       }
+
+       if (_video_stream < 0) {
+               throw DecodeError ("could not find video stream");
+       }
+       if (_audio_stream < 0) {
+               throw DecodeError ("could not find audio stream");
+       }
+
+       _frame = avcodec_alloc_frame ();
+       if (_frame == 0) {
+               throw DecodeError ("could not allocate frame");
+       }
+}
+
+void
+FFmpegDecoder::setup_video ()
+{
+       _video_codec_context = _format_context->streams[_video_stream]->codec;
+       _video_codec = avcodec_find_decoder (_video_codec_context->codec_id);
+
+       if (_video_codec == 0) {
+               throw DecodeError ("could not find video decoder");
+       }
+       
+       if (avcodec_open2 (_video_codec_context, _video_codec, 0) < 0) {
+               throw DecodeError ("could not open video decoder");
+       }
+}
+
+void
+FFmpegDecoder::setup_audio ()
+{
+       _audio_codec_context = _format_context->streams[_audio_stream]->codec;
+       _audio_codec = avcodec_find_decoder (_audio_codec_context->codec_id);
+
+       if (_audio_codec == 0) {
+               throw DecodeError ("could not find audio decoder");
+       }
+       
+       if (avcodec_open2 (_audio_codec_context, _audio_codec, 0) < 0) {
+               throw DecodeError ("could not open audio decoder");
+       }
+}
+
+bool
+FFmpegDecoder::do_pass ()
+{
+       int r = av_read_frame (_format_context, &_packet);
+       if (r < 0) {
+               return true;
+       }
+
+       if (_packet.stream_index == _video_stream && _opt->decode_video) {
+               
+               int frame_finished;
+               if (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+                       process_video (_frame);
+               }
+
+       } else if (_packet.stream_index == _audio_stream && _opt->decode_audio) {
+               
+               avcodec_get_frame_defaults (_frame);
+               
+               int frame_finished;
+               if (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+                       int const data_size = av_samples_get_buffer_size (
+                               0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1
+                               );
+
+                       process_audio (_frame->data[0], _audio_codec_context->channels, data_size);
+               }
+       }
+       
+       av_free_packet (&_packet);
+       return false;
+}
+
+int
+FFmpegDecoder::length_in_frames () const
+{
+       return (_format_context->duration / AV_TIME_BASE) * frames_per_second ();
+}
+
+float
+FFmpegDecoder::frames_per_second () const
+{
+       return av_q2d (_format_context->streams[_video_stream]->avg_frame_rate);
+}
+
+int
+FFmpegDecoder::audio_channels () const
+{
+       if (_audio_codec_context == 0) {
+               return 0;
+       }
+       
+       return _audio_codec_context->channels;
+}
+
+int
+FFmpegDecoder::audio_sample_rate () const
+{
+       if (_audio_codec_context == 0) {
+               return 0;
+       }
+       
+       return _audio_codec_context->sample_rate;
+}
+
+AVSampleFormat
+FFmpegDecoder::audio_sample_format () const
+{
+       return _audio_codec_context->sample_fmt;
+}
+
+Size
+FFmpegDecoder::native_size () const
+{
+       return Size (_video_codec_context->width, _video_codec_context->height);
+}
+
+PixelFormat
+FFmpegDecoder::pixel_format () const
+{
+       return _video_codec_context->pix_fmt;
+}
+
+int
+FFmpegDecoder::time_base_numerator () const
+{
+       return _video_codec_context->time_base.num;
+}
+
+int
+FFmpegDecoder::time_base_denominator () const
+{
+       return _video_codec_context->time_base.den;
+}
+
+int
+FFmpegDecoder::sample_aspect_ratio_numerator () const
+{
+       return _video_codec_context->sample_aspect_ratio.num;
+}
+
+int
+FFmpegDecoder::sample_aspect_ratio_denominator () const
+{
+       return _video_codec_context->sample_aspect_ratio.den;
+}
+

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
new file mode 100644 (file)
index 0000000..d66acad
--- /dev/null
+++ b/src/lib/ffmpeg_decoder.h
@@ -0,0 +1,90 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/ffmpeg_decoder.h
+ *  @brief A decoder using FFmpeg to decode content.
+ */
+
+#include <vector>
+#include <string>
+#include <stdint.h>
+#include <boost/shared_ptr.hpp>
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libpostproc/postprocess.h>
+}
+#include "util.h"
+#include "decoder.h"
+
+struct AVFilterGraph;
+struct AVCodecContext;
+struct AVFilterContext;
+struct AVFormatContext;
+struct AVFrame;
+struct AVBufferContext;
+struct AVCodec;
+class Job;
+class FilmState;
+class Options;
+class Image;
+class Log;
+
+/** @class FFmpegDecoder
+ *  @brief A decoder using FFmpeg to decode content.
+ */
+class FFmpegDecoder : public Decoder
+{
+public:
+       FFmpegDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+       ~FFmpegDecoder ();
+
+       /* Methods to query our input video */
+       int length_in_frames () const;
+       int decoding_frames () const;
+       float frames_per_second () const;
+       Size native_size () const;
+       int audio_channels () const;
+       int audio_sample_rate () const;
+       AVSampleFormat audio_sample_format () const;
+
+private:
+
+       bool do_pass ();
+       PixelFormat pixel_format () const;
+       int time_base_numerator () const;
+       int time_base_denominator () const;
+       int sample_aspect_ratio_numerator () const;
+       int sample_aspect_ratio_denominator () const;
+
+       void setup_general ();
+       void setup_video ();
+       void setup_audio ();
+
+       AVFormatContext* _format_context;
+       int _video_stream;
+       int _audio_stream;
+       AVFrame* _frame;
+       
+       AVCodecContext* _video_codec_context;
+       AVCodec* _video_codec;
+       AVCodecContext* _audio_codec_context;
+       AVCodec* _audio_codec;
+
+       AVPacket _packet;
+};

diff --git a/src/lib/film.cc b/src/lib/film.cc
new file mode 100644 (file)
index 0000000..3eea41c
--- /dev/null
+++ b/src/lib/film.cc
@@ -0,0 +1,631 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <stdexcept>
+#include <iostream>
+#include <fstream>
+#include <cstdlib>
+#include <sstream>
+#include <iomanip>
+#include <unistd.h>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include "film.h"
+#include "format.h"
+#include "tiff_encoder.h"
+#include "job.h"
+#include "filter.h"
+#include "transcoder.h"
+#include "util.h"
+#include "job_manager.h"
+#include "ab_transcode_job.h"
+#include "transcode_job.h"
+#include "make_mxf_job.h"
+#include "scp_dcp_job.h"
+#include "copy_from_dvd_job.h"
+#include "make_dcp_job.h"
+#include "film_state.h"
+#include "log.h"
+#include "options.h"
+#include "exceptions.h"
+#include "examine_content_job.h"
+#include "scaler.h"
+#include "decoder_factory.h"
+#include "config.h"
+
+using namespace std;
+using namespace boost;
+
+/** Construct a Film object in a given directory, reading any metadata
+ *  file that exists in that directory.  An exception will be thrown if
+ *  must_exist is true, and the specified directory does not exist.
+ *
+ *  @param d Film directory.
+ *  @param must_exist true to throw an exception if does not exist.
+ */
+
+Film::Film (string d, bool must_exist)
+       : _dirty (false)
+{
+       /* Make _state.directory a complete path without ..s (where possible)
+          (Code swiped from Adam Bowen on stackoverflow)
+       */
+       
+       filesystem::path p (filesystem::system_complete (d));
+       filesystem::path result;
+       for(filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
+               if (*i == "..") {
+                       if (filesystem::is_symlink (result) || result.filename() == "..") {
+                               result /= *i;
+                       } else {
+                               result = result.parent_path ();
+                       }
+               } else if (*i != ".") {
+                       result /= *i;
+               }
+       }
+
+       _state.directory = result.string ();
+       
+       if (must_exist && !filesystem::exists (_state.directory)) {
+               throw OpenFileError (_state.directory);
+       }
+
+       read_metadata ();
+
+       _log = new Log (_state.file ("log"));
+}
+
+/** Copy constructor */
+Film::Film (Film const & other)
+       : _state (other._state)
+       , _dirty (other._dirty)
+{
+
+}
+
+Film::~Film ()
+{
+       delete _log;
+}
+         
+/** Read the `metadata' file inside this Film's directory, and fill the
+ *  object's data with its content.
+ */
+
+void
+Film::read_metadata ()
+{
+       ifstream f (metadata_file().c_str ());
+       string line;
+       while (getline (f, line)) {
+               if (line.empty ()) {
+                       continue;
+               }
+               
+               if (line[0] == '#') {
+                       continue;
+               }
+
+               size_t const s = line.find (' ');
+               if (s == string::npos) {
+                       continue;
+               }
+
+               _state.read_metadata (line.substr (0, s), line.substr (s + 1));
+       }
+
+       _dirty = false;
+}
+
+/** Write our state to a file `metadata' inside the Film's directory */
+void
+Film::write_metadata () const
+{
+       filesystem::create_directories (_state.directory);
+       
+       ofstream f (metadata_file().c_str ());
+       if (!f.good ()) {
+               throw CreateFileError (metadata_file ());
+       }
+
+       _state.write_metadata (f);
+
+       _dirty = false;
+}
+
+/** Set the name by which DVD-o-matic refers to this Film */
+void
+Film::set_name (string n)
+{
+       _state.name = n;
+       signal_changed (NAME);
+}
+
+/** Set the content file for this film.
+ *  @param c New content file; if specified as an absolute path, the content should
+ *  be within the film's _state.directory; if specified as a relative path, the content
+ *  will be assumed to be within the film's _state.directory.
+ */
+void
+Film::set_content (string c)
+{
+       if (filesystem::path(c).has_root_directory () && starts_with (c, _state.directory)) {
+               c = c.substr (_state.directory.length() + 1);
+       }
+
+       if (c == _state.content) {
+               return;
+       }
+       
+       /* Create a temporary decoder so that we can get information
+          about the content.
+       */
+       shared_ptr<FilmState> s = state_copy ();
+       s->content = c;
+       shared_ptr<Options> o (new Options ("", "", ""));
+       o->out_size = Size (1024, 1024);
+
+       shared_ptr<Decoder> d = decoder_factory (s, o, 0, _log);
+       
+       _state.size = d->native_size ();
+       _state.length = d->length_in_frames ();
+       _state.frames_per_second = d->frames_per_second ();
+       _state.audio_channels = d->audio_channels ();
+       _state.audio_sample_rate = d->audio_sample_rate ();
+       _state.audio_sample_format = d->audio_sample_format ();
+
+       _state.content = c;
+       
+       signal_changed (SIZE);
+       signal_changed (LENGTH);
+       signal_changed (FRAMES_PER_SECOND);
+       signal_changed (AUDIO_CHANNELS);
+       signal_changed (AUDIO_SAMPLE_RATE);
+       signal_changed (CONTENT);
+}
+
+/** Set the format that this Film should be shown in */
+void
+Film::set_format (Format const * f)
+{
+       _state.format = f;
+       signal_changed (FORMAT);
+}
+
+/** Set the type to specify the DCP as having
+ *  (feature, trailer etc.)
+ */
+void
+Film::set_dcp_content_type (DCPContentType const * t)
+{
+       _state.dcp_content_type = t;
+       signal_changed (DCP_CONTENT_TYPE);
+}
+
+/** Set the number of pixels by which to crop the left of the source video */
+void
+Film::set_left_crop (int c)
+{
+       if (c == _state.left_crop) {
+               return;
+       }
+       
+       _state.left_crop = c;
+       signal_changed (LEFT_CROP);
+}
+
+/** Set the number of pixels by which to crop the right of the source video */
+void
+Film::set_right_crop (int c)
+{
+       if (c == _state.right_crop) {
+               return;
+       }
+
+       _state.right_crop = c;
+       signal_changed (RIGHT_CROP);
+}
+
+/** Set the number of pixels by which to crop the top of the source video */
+void
+Film::set_top_crop (int c)
+{
+       if (c == _state.top_crop) {
+               return;
+       }
+       
+       _state.top_crop = c;
+       signal_changed (TOP_CROP);
+}
+
+/** Set the number of pixels by which to crop the bottom of the source video */
+void
+Film::set_bottom_crop (int c)
+{
+       if (c == _state.bottom_crop) {
+               return;
+       }
+       
+       _state.bottom_crop = c;
+       signal_changed (BOTTOM_CROP);
+}
+
+/** Set the filters to apply to the image when generating thumbnails
+ *  or a DCP.
+ */
+void
+Film::set_filters (vector<Filter const *> const & f)
+{
+       _state.filters = f;
+       signal_changed (FILTERS);
+}
+
+/** Set the number of frames to put in any generated DCP (from
+ *  the start of the film).  0 indicates that all frames should
+ *  be used.
+ */
+void
+Film::set_dcp_frames (int n)
+{
+       _state.dcp_frames = n;
+       signal_changed (DCP_FRAMES);
+}
+
+void
+Film::set_dcp_trim_action (TrimAction a)
+{
+       _state.dcp_trim_action = a;
+       signal_changed (DCP_TRIM_ACTION);
+}
+
+/** Set whether or not to generate a A/B comparison DCP.
+ *  Such a DCP has the left half of its frame as the Film
+ *  content without any filtering or post-processing; the
+ *  right half is rendered with filters and post-processing.
+ */
+void
+Film::set_dcp_ab (bool a)
+{
+       _state.dcp_ab = a;
+       signal_changed (DCP_AB);
+}
+
+void
+Film::set_audio_gain (float g)
+{
+       _state.audio_gain = g;
+       signal_changed (AUDIO_GAIN);
+}
+
+void
+Film::set_audio_delay (int d)
+{
+       _state.audio_delay = d;
+       signal_changed (AUDIO_DELAY);
+}
+
+/** @return path of metadata file */
+string
+Film::metadata_file () const
+{
+       return _state.file ("metadata");
+}
+
+/** @return full path of the content (actual video) file
+ *  of this Film.
+ */
+string
+Film::content () const
+{
+       return _state.content_path ();
+}
+
+/** The pre-processing GUI part of a thumbs update.
+ *  Must be called from the GUI thread.
+ */
+void
+Film::update_thumbs_pre_gui ()
+{
+       _state.thumbs.clear ();
+       filesystem::remove_all (_state.dir ("thumbs"));
+
+       /* This call will recreate the directory */
+       _state.dir ("thumbs");
+}
+
+/** The post-processing GUI part of a thumbs update.
+ *  Must be called from the GUI thread.
+ */
+void
+Film::update_thumbs_post_gui ()
+{
+       string const tdir = _state.dir ("thumbs");
+       
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (tdir); i != filesystem::directory_iterator(); ++i) {
+
+               /* Aah, the sweet smell of progress */
+#if BOOST_FILESYSTEM_VERSION == 3              
+               string const l = filesystem::path(*i).leaf().generic_string();
+#else
+               string const l = i->leaf ();
+#endif
+               
+               size_t const d = l.find (".tiff");
+               if (d != string::npos) {
+                       _state.thumbs.push_back (atoi (l.substr (0, d).c_str()));
+               }
+       }
+
+       sort (_state.thumbs.begin(), _state.thumbs.end());
+       
+       write_metadata ();
+       signal_changed (THUMBS);
+}
+
+/** @return the number of thumbnail images that we have */
+int
+Film::num_thumbs () const
+{
+       return _state.thumbs.size ();
+}
+
+/** @param n A thumb index.
+ *  @return The frame within the Film that it is for.
+ */
+int
+Film::thumb_frame (int n) const
+{
+       return _state.thumb_frame (n);
+}
+
+/** @param n A thumb index.
+ *  @return The path to the thumb's image file.
+ */
+string
+Film::thumb_file (int n) const
+{
+       return _state.thumb_file (n);
+}
+
+/** @return The path to the directory to write JPEG2000 files to */
+string
+Film::j2k_dir () const
+{
+       assert (format());
+
+       stringstream s;
+
+       /* Start with j2c */
+       s << "j2c/";
+
+       pair<string, string> f = Filter::ffmpeg_strings (filters ());
+
+       /* Write stuff to specify the filter / post-processing settings that are in use,
+          so that we don't get confused about J2K files generated using different
+          settings.
+       */
+       s << _state.format->nickname()
+         << "_" << _state.content
+         << "_" << left_crop() << "_" << right_crop() << "_" << top_crop() << "_" << bottom_crop()
+         << "_" << f.first << "_" << f.second
+         << "_" << _state.scaler->id();
+
+       /* Similarly for the A/B case */
+       if (dcp_ab()) {
+               pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
+               s << "/ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
+       }
+       
+       return _state.dir (s.str ());
+}
+
+/** Handle a change to the Film's metadata */
+void
+Film::signal_changed (Property p)
+{
+       _dirty = true;
+       Changed (p);
+}
+
+/** Add suitable Jobs to the JobManager to create a DCP for this Film.
+ *  @param true to transcode, false to use the WAV and J2K files that are already there.
+ */
+void
+Film::make_dcp (bool transcode, int freq)
+{
+       string const t = name ();
+       if (t.find ("/") != string::npos) {
+               throw BadSettingError ("name", "cannot contain slashes");
+       }
+       
+       {
+               stringstream s;
+               s << "DVD-o-matic " << DVDOMATIC_VERSION << " using " << dependency_version_summary ();
+               log()->log (s.str ());
+       }
+
+       {
+               char buffer[128];
+               gethostname (buffer, sizeof (buffer));
+               stringstream s;
+               s << "Starting to make a DCP on " << buffer;
+               log()->log (s.str ());
+       }
+               
+       if (format() == 0) {
+               throw MissingSettingError ("format");
+       }
+
+       if (content().empty ()) {
+               throw MissingSettingError ("content");
+       }
+
+       if (dcp_content_type() == 0) {
+               throw MissingSettingError ("content type");
+       }
+
+       if (name().empty()) {
+               throw MissingSettingError ("name");
+       }
+
+       shared_ptr<const FilmState> fs = state_copy ();
+       shared_ptr<Options> o (new Options (j2k_dir(), ".j2c", _state.dir ("wavs")));
+       o->out_size = format()->dcp_size ();
+       if (dcp_frames() == 0) {
+               /* Decode the whole film, no blacking */
+               o->num_frames = 0;
+               o->black_after = 0;
+       } else {
+               switch (dcp_trim_action()) {
+               case CUT:
+                       /* Decode only part of the film, no blacking */
+                       o->num_frames = dcp_frames ();
+                       o->black_after = 0;
+                       break;
+               case BLACK_OUT:
+                       /* Decode the whole film, but black some frames out */
+                       o->num_frames = 0;
+                       o->black_after = dcp_frames ();
+               }
+       }
+       
+       o->decode_video_frequency = freq;
+       o->padding = format()->dcp_padding ();
+       o->ratio = format()->ratio_as_float ();
+
+       if (transcode) {
+               if (_state.dcp_ab) {
+                       JobManager::instance()->add (shared_ptr<Job> (new ABTranscodeJob (fs, o, log ())));
+               } else {
+                       JobManager::instance()->add (shared_ptr<Job> (new TranscodeJob (fs, o, log ())));
+               }
+       }
+       
+       JobManager::instance()->add (shared_ptr<Job> (new MakeMXFJob (fs, o, log (), MakeMXFJob::VIDEO)));
+       if (audio_channels() > 0) {
+               JobManager::instance()->add (shared_ptr<Job> (new MakeMXFJob (fs, o, log (), MakeMXFJob::AUDIO)));
+       }
+       JobManager::instance()->add (shared_ptr<Job> (new MakeDCPJob (fs, o, log ())));
+}
+
+shared_ptr<FilmState>
+Film::state_copy () const
+{
+       return shared_ptr<FilmState> (new FilmState (_state));
+}
+
+void
+Film::copy_from_dvd_post_gui ()
+{
+       const string dvd_dir = _state.dir ("dvd");
+
+       string largest_file;
+       uintmax_t largest_size = 0;
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (dvd_dir); i != filesystem::directory_iterator(); ++i) {
+               uintmax_t const s = filesystem::file_size (*i);
+               if (s > largest_size) {
+
+#if BOOST_FILESYSTEM_VERSION == 3              
+                       largest_file = filesystem::path(*i).generic_string();
+#else
+                       largest_file = i->string ();
+#endif
+                       largest_size = s;
+               }
+       }
+
+       set_content (largest_file);
+}
+
+void
+Film::examine_content ()
+{
+       if (_examine_content_job) {
+               return;
+       }
+       
+       _examine_content_job.reset (new ExamineContentJob (state_copy (), log ()));
+       _examine_content_job->Finished.connect (sigc::mem_fun (*this, &Film::examine_content_post_gui));
+       JobManager::instance()->add (_examine_content_job);
+}
+
+void
+Film::examine_content_post_gui ()
+{
+       _state.length = _examine_content_job->last_video_frame ();
+       signal_changed (LENGTH);
+       
+       _examine_content_job.reset ();
+}
+
+void
+Film::set_scaler (Scaler const * s)
+{
+       _state.scaler = s;
+       signal_changed (SCALER);
+}
+
+void
+Film::set_frames_per_second (float f)
+{
+       _state.frames_per_second = f;
+       signal_changed (FRAMES_PER_SECOND);
+}
+
+/** @return full paths to any audio files that this Film has */
+vector<string>
+Film::audio_files () const
+{
+       vector<string> f;
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (_state.dir("wavs")); i != filesystem::directory_iterator(); ++i) {
+               f.push_back (i->path().string ());
+       }
+
+       return f;
+}
+
+ContentType
+Film::content_type () const
+{
+       return _state.content_type ();
+}
+
+void
+Film::set_still_duration (int d)
+{
+       _state.still_duration = d;
+       signal_changed (STILL_DURATION);
+}
+
+void
+Film::send_dcp_to_tms ()
+{
+       shared_ptr<Job> j (new SCPDCPJob (state_copy (), log ()));
+       JobManager::instance()->add (j);
+}
+
+void
+Film::copy_from_dvd ()
+{
+       shared_ptr<Job> j (new CopyFromDVDJob (state_copy (), log ()));
+       j->Finished.connect (sigc::mem_fun (*this, &Film::copy_from_dvd_post_gui));
+       JobManager::instance()->add (j);
+}
+

diff --git a/src/lib/film.h b/src/lib/film.h
new file mode 100644 (file)
index 0000000..f746da4
--- /dev/null
+++ b/src/lib/film.h
@@ -0,0 +1,275 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/film.h
+ *  @brief A representation of a piece of video (with sound), including naming,
+ *  the source content file, and how it should be presented in a DCP.
+ */
+
+#ifndef DVDOMATIC_FILM_H
+#define DVDOMATIC_FILM_H
+
+#include <string>
+#include <vector>
+#include <inttypes.h>
+#include <boost/thread/mutex.hpp>
+#include <sigc++/signal.h>
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
+#include "dcp_content_type.h"
+#include "film_state.h"
+
+class Format;
+class Job;
+class Filter;
+class Log;
+class ExamineContentJob;
+
+/** @class Film
+ *  @brief A representation of a video with sound.
+ *
+ *  A representation of a piece of video (with sound), including naming,
+ *  the source content file, and how it should be presented in a DCP.
+ */
+class Film
+{
+public:
+       Film (std::string d, bool must_exist = true);
+       Film (Film const &);
+       ~Film ();
+
+       void write_metadata () const;
+
+       /** @return complete path to directory containing the film metadata */
+       std::string directory () const {
+               return _state.directory;
+       }
+
+       std::string content () const;
+       ContentType content_type () const;
+
+       /** @return name for DVD-o-matic */
+       std::string name () const {
+               return _state.name;
+       }
+
+       /** @return number of pixels to crop from the top of the original picture */
+       int top_crop () const {
+               return _state.top_crop;
+       }
+
+       /** @return number of pixels to crop from the bottom of the original picture */
+       int bottom_crop () const {
+               return _state.bottom_crop;
+       }
+
+       /** @return number of pixels to crop from the left-hand side of the original picture */
+       int left_crop () const {
+               return _state.left_crop;
+       }
+
+       /** @return number of pixels to crop from the right-hand side of the original picture */
+       int right_crop () const {
+               return _state.right_crop;
+       }
+
+       /** @return the format to present this film in (flat, scope, etc.) */
+       Format const * format () const {
+               return _state.format;
+       }
+
+       /** @return video filters that should be used when generating DCPs */
+       std::vector<Filter const *> filters () const {
+               return _state.filters;
+       }
+
+       /** @return scaler algorithm to use */
+       Scaler const * scaler () const {
+               return _state.scaler;
+       }
+
+       /** @return number of frames to put in the DCP, or 0 for all */
+       int dcp_frames () const {
+               return _state.dcp_frames;
+       }
+
+       TrimAction dcp_trim_action () const {
+               return _state.dcp_trim_action;
+       }
+
+       /** @return true to create an A/B comparison DCP, where the left half of the image
+        *  is the video without any filters or post-processing, and the right half
+        *  has the specified filters and post-processing.
+        */
+       bool dcp_ab () const {
+               return _state.dcp_ab;
+       }
+
+       float audio_gain () const {
+               return _state.audio_gain;
+       }
+
+       int audio_delay () const {
+               return _state.audio_delay;
+       }
+
+       int still_duration () const {
+               return _state.still_duration;
+       }
+       
+       void set_filters (std::vector<Filter const *> const &);
+
+       void set_scaler (Scaler const *);
+
+       /** @return the type of content that this Film represents (feature, trailer etc.) */
+       DCPContentType const * dcp_content_type () {
+               return _state.dcp_content_type;
+       }
+
+       void set_dcp_frames (int);
+       void set_dcp_trim_action (TrimAction);
+       void set_dcp_ab (bool);
+       
+       void set_name (std::string);
+       void set_content (std::string);
+       void set_top_crop (int);
+       void set_bottom_crop (int);
+       void set_left_crop (int);
+       void set_right_crop (int);
+       void set_frames_per_second (float);
+       void set_format (Format const *);
+       void set_dcp_content_type (DCPContentType const *);
+       void set_audio_gain (float);
+       void set_audio_delay (int);
+       void set_still_duration (int);
+
+       /** @return size, in pixels, of the source (ignoring cropping) */
+       Size size () const {
+               return _state.size;
+       }
+
+       /** @return length, in video frames */
+       int length () const {
+               return _state.length;
+       }
+
+       /** @return nnumber of video frames per second */
+       float frames_per_second () const {
+               return _state.frames_per_second;
+       }
+
+       /** @return number of audio channels */
+       int audio_channels () const {
+               return _state.audio_channels;
+       }
+
+       /** @return audio sample rate, in Hz */
+       int audio_sample_rate () const {
+               return _state.audio_sample_rate;
+       }
+
+       /** @return format of the audio samples */
+       AVSampleFormat audio_sample_format () const {
+               return _state.audio_sample_format;
+       }
+       
+       std::string j2k_dir () const;
+
+       std::vector<std::string> audio_files () const;
+
+       void update_thumbs_pre_gui ();
+       void update_thumbs_post_gui ();
+       int num_thumbs () const;
+       int thumb_frame (int) const;
+       std::string thumb_file (int) const;
+
+       void copy_from_dvd_post_gui ();
+       void examine_content ();
+       void examine_content_post_gui ();
+       void send_dcp_to_tms ();
+       void copy_from_dvd ();
+
+       /** @return true if our metadata has been modified since it was last saved */
+       bool dirty () const {
+               return _dirty;
+       }
+
+       void make_dcp (bool, int freq = 0);
+
+       enum Property {
+               NAME,
+               CONTENT,
+               DCP_CONTENT_TYPE,
+               FORMAT,
+               LEFT_CROP,
+               RIGHT_CROP,
+               TOP_CROP,
+               BOTTOM_CROP,
+               FILTERS,
+               SCALER,
+               DCP_FRAMES,
+               DCP_TRIM_ACTION,
+               DCP_AB,
+               AUDIO_GAIN,
+               AUDIO_DELAY,
+               THUMBS,
+               SIZE,
+               LENGTH,
+               FRAMES_PER_SECOND,
+               AUDIO_CHANNELS,
+               AUDIO_SAMPLE_RATE,
+               STILL_DURATION
+       };
+
+       boost::shared_ptr<FilmState> state_copy () const;
+
+       /** @return Logger.
+        *  It is safe to call this from any thread.
+        */
+       Log* log () const {
+               return _log;
+       }
+
+       /** Emitted when some metadata property has changed */
+       mutable sigc::signal1<void, Property> Changed;
+       
+private:
+       void read_metadata ();
+       std::string metadata_file () const;
+       void update_dimensions ();
+       void signal_changed (Property);
+
+       /** The majority of our state.  Kept in a separate object
+        *  so that it can easily be copied for passing onto long-running
+        *  jobs (which then have an unchanging set of parameters).
+        */
+       FilmState _state;
+
+       /** true if our metadata has changed since it was last written to disk */
+       mutable bool _dirty;
+
+       /** Log to write to */
+       Log* _log;
+
+       /** Any running ExamineContentJob, or 0 */
+       boost::shared_ptr<ExamineContentJob> _examine_content_job;
+};
+
+#endif

diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
new file mode 100644 (file)
index 0000000..1637808
--- /dev/null
+++ b/src/lib/film_state.cc
@@ -0,0 +1,254 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/film_state.cc
+ *  @brief The state of a Film.  This is separate from Film so that
+ *  state can easily be copied and kept around for reference
+ *  by long-running jobs.  This avoids the jobs getting confused
+ *  by the user changing Film settings during their run.
+ */
+
+#include <fstream>
+#include <string>
+#include <iomanip>
+#include <sstream>
+#include <boost/filesystem.hpp>
+#include "film_state.h"
+#include "scaler.h"
+#include "filter.h"
+#include "format.h"
+#include "dcp_content_type.h"
+#include "util.h"
+
+using namespace std;
+using namespace boost;
+
+/** Write state to a stream.
+ *  @param f Stream to write to.
+ */
+void
+FilmState::write_metadata (ofstream& f) const
+{
+       /* User stuff */
+       f << "name " << name << "\n";
+       f << "content " << content << "\n";
+       if (dcp_content_type) {
+               f << "dcp_content_type " << dcp_content_type->pretty_name () << "\n";
+       }
+       f << "frames_per_second " << frames_per_second << "\n";
+       if (format) {
+               f << "format " << format->as_metadata () << "\n";
+       }
+       f << "left_crop " << left_crop << "\n";
+       f << "right_crop " << right_crop << "\n";
+       f << "top_crop " << top_crop << "\n";
+       f << "bottom_crop " << bottom_crop << "\n";
+       for (vector<Filter const *>::const_iterator i = filters.begin(); i != filters.end(); ++i) {
+               f << "filter " << (*i)->id () << "\n";
+       }
+       f << "scaler " << scaler->id () << "\n";
+       f << "dcp_frames " << dcp_frames << "\n";
+
+       f << "dcp_trim_action ";
+       switch (dcp_trim_action) {
+       case CUT:
+               f << "cut\n";
+               break;
+       case BLACK_OUT:
+               f << "black_out\n";
+               break;
+       }
+       
+       f << "dcp_ab " << (dcp_ab ? "1" : "0") << "\n";
+       f << "audio_gain " << audio_gain << "\n";
+       f << "audio_delay " << audio_delay << "\n";
+       f << "still_duration " << still_duration << "\n";
+
+       /* Cached stuff; this is information about our content; we could
+          look it up each time, but that's slow.
+       */
+       for (vector<int>::const_iterator i = thumbs.begin(); i != thumbs.end(); ++i) {
+               f << "thumb " << *i << "\n";
+       }
+       f << "width " << size.width << "\n";
+       f << "height " << size.height << "\n";
+       f << "length " << length << "\n";
+       f << "audio_channels " << audio_channels << "\n";
+       f << "audio_sample_rate " << audio_sample_rate << "\n";
+       f << "audio_sample_format " << audio_sample_format_to_string (audio_sample_format) << "\n";
+}
+
+/** Read state from a key / value pair.
+ *  @param k Key.
+ *  @param v Value.
+ */
+void
+FilmState::read_metadata (string k, string v)
+{
+       /* User-specified stuff */
+       if (k == "name") {
+               name = v;
+       } else if (k == "content") {
+               content = v;
+       } else if (k == "dcp_content_type") {
+               dcp_content_type = DCPContentType::from_pretty_name (v);
+       } else if (k == "frames_per_second") {
+               frames_per_second = atof (v.c_str ());
+       } else if (k == "format") {
+               format = Format::from_metadata (v);
+       } else if (k == "left_crop") {
+               left_crop = atoi (v.c_str ());
+       } else if (k == "right_crop") {
+               right_crop = atoi (v.c_str ());
+       } else if (k == "top_crop") {
+               top_crop = atoi (v.c_str ());
+       } else if (k == "bottom_crop") {
+               bottom_crop = atoi (v.c_str ());
+       } else if (k == "filter") {
+               filters.push_back (Filter::from_id (v));
+       } else if (k == "scaler") {
+               scaler = Scaler::from_id (v);
+       } else if (k == "dcp_frames") {
+               dcp_frames = atoi (v.c_str ());
+       } else if (k == "dcp_trim_action") {
+               if (v == "cut") {
+                       dcp_trim_action = CUT;
+               } else if (v == "black_out") {
+                       dcp_trim_action = BLACK_OUT;
+               }
+       } else if (k == "dcp_ab") {
+               dcp_ab = (v == "1");
+       } else if (k == "audio_gain") {
+               audio_gain = atof (v.c_str ());
+       } else if (k == "audio_delay") {
+               audio_delay = atoi (v.c_str ());
+       } else if (k == "still_duration") {
+               still_duration = atoi (v.c_str ());
+       }
+       
+       /* Cached stuff */
+       if (k == "thumb") {
+               int const n = atoi (v.c_str ());
+               /* Only add it to the list if it still exists */
+               if (filesystem::exists (thumb_file_for_frame (n))) {
+                       thumbs.push_back (n);
+               }
+       } else if (k == "width") {
+               size.width = atoi (v.c_str ());
+       } else if (k == "height") {
+               size.height = atoi (v.c_str ());
+       } else if (k == "length") {
+               length = atof (v.c_str ());
+       } else if (k == "audio_channels") {
+               audio_channels = atoi (v.c_str ());
+       } else if (k == "audio_sample_rate") {
+               audio_sample_rate = atoi (v.c_str ());
+       } else if (k == "audio_sample_format") {
+               audio_sample_format = audio_sample_format_from_string (v);
+       }
+}
+
+
+/** @param n A thumb index.
+ *  @return The path to the thumb's image file.
+ */
+string
+FilmState::thumb_file (int n) const
+{
+       return thumb_file_for_frame (thumb_frame (n));
+}
+
+/** @param n A frame index within the Film.
+ *  @return The path to the thumb's image file for this frame;
+ *  we assume that it exists.
+ */
+string
+FilmState::thumb_file_for_frame (int n) const
+{
+       stringstream s;
+       s << dir ("thumbs") << "/";
+       s.width (8);
+       s << setfill('0') << n << ".tiff";
+       return s.str ();
+}
+
+
+/** @param n A thumb index.
+ *  @return The frame within the Film that it is for.
+ */
+int
+FilmState::thumb_frame (int n) const
+{
+       assert (n < int (thumbs.size ()));
+       return thumbs[n];
+}
+
+Size
+FilmState::cropped_size (Size s) const
+{
+       s.width -= left_crop + right_crop;
+       s.height -= top_crop + bottom_crop;
+       return s;
+}
+
+/** Given a directory name, return its full path within the Film's directory.
+ *  The directory (and its parents) will be created if they do not exist.
+ */
+string
+FilmState::dir (string d) const
+{
+       stringstream s;
+       s << directory << "/" << d;
+       filesystem::create_directories (s.str ());
+       return s.str ();
+}
+
+/** Given a file or directory name, return its full path within the Film's directory */
+string
+FilmState::file (string f) const
+{
+       stringstream s;
+       s << directory << "/" << f;
+       return s.str ();
+}
+
+string
+FilmState::content_path () const
+{
+       if (filesystem::path(content).has_root_directory ()) {
+               return content;
+       }
+
+       return file (content);
+}
+
+ContentType
+FilmState::content_type () const
+{
+#if BOOST_FILESYSTEM_VERSION == 3
+       string const ext = filesystem::path(content).extension().string();
+#else
+       string const ext = filesystem::path(content).extension();
+#endif
+       if (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png") {
+               return STILL;
+       }
+
+       return VIDEO;
+}

diff --git a/src/lib/film_state.h b/src/lib/film_state.h
new file mode 100644 (file)
index 0000000..52525ec
--- /dev/null
+++ b/src/lib/film_state.h
@@ -0,0 +1,155 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/film_state.h
+ *  @brief The state of a Film.  This is separate from Film so that
+ *  state can easily be copied and kept around for reference
+ *  by long-running jobs.  This avoids the jobs getting confused
+ *  by the user changing Film settings during their run.
+ */
+
+#ifndef DVDOMATIC_FILM_STATE_H
+#define DVDOMATIC_FILM_STATE_H
+
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libswscale/swscale.h>
+}
+#include "scaler.h"
+#include "util.h"
+#include "trim_action.h"
+
+class Format;
+class DCPContentType;
+class Filter;
+
+/** @class FilmState
+ *  @brief The state of a Film.
+ *
+ *  This is separate from Film so that state can easily be copied and
+ *  kept around for reference by long-running jobs.  This avoids the
+ *  jobs getting confused by the user changing Film settings during
+ *  their run.
+ */
+
+class FilmState
+{
+public:
+       FilmState ()
+               : dcp_content_type (0)
+               , frames_per_second (0)
+               , format (0)
+               , left_crop (0)
+               , right_crop (0)
+               , top_crop (0)
+               , bottom_crop (0)
+               , scaler (Scaler::from_id ("bicubic"))
+               , dcp_frames (0)
+               , dcp_trim_action (CUT)
+               , dcp_ab (false)
+               , audio_gain (0)
+               , audio_delay (0)
+               , still_duration (10)
+               , length (0)
+               , audio_channels (0)
+               , audio_sample_rate (0)
+               , audio_sample_format (AV_SAMPLE_FMT_NONE)
+       {}
+
+       std::string file (std::string f) const;
+       std::string dir (std::string d) const;
+
+       std::string content_path () const;
+       ContentType content_type () const;
+       
+       bool content_is_dvd () const;
+
+       std::string thumb_file (int) const;
+       int thumb_frame (int) const;
+       
+       void write_metadata (std::ofstream &) const;
+       void read_metadata (std::string, std::string);
+
+       Size cropped_size (Size) const;
+
+       /** Complete path to directory containing the film metadata;
+           must not be relative.
+       */
+       std::string directory;
+       /** Name for DVD-o-matic */
+       std::string name;
+       /** File or directory containing content; may be relative to our directory
+        *  or an absolute path.
+        */
+       std::string content;
+       /** The type of content that this Film represents (feature, trailer etc.) */
+       DCPContentType const * dcp_content_type;
+       /** Frames per second of the source */
+       float frames_per_second;
+       /** The format to present this Film in (flat, scope, etc.) */
+       Format const * format;
+       /** Number of pixels to crop from the left-hand side of the original picture */
+       int left_crop;
+       /** Number of pixels to crop from the right-hand side of the original picture */
+       int right_crop;
+       /** Number of pixels to crop from the top of the original picture */
+       int top_crop;
+       /** Number of pixels to crop from the bottom of the original picture */
+       int bottom_crop;
+       /** Video filters that should be used when generating DCPs */
+       std::vector<Filter const *> filters;
+       /** Scaler algorithm to use */
+       Scaler const * scaler;
+       /** Number of frames to put in the DCP, or 0 for all */
+       int dcp_frames;
+
+       TrimAction dcp_trim_action;
+               
+       /** true to create an A/B comparison DCP, where the left half of the image
+           is the video without any filters or post-processing, and the right half
+           has the specified filters and post-processing.
+       */
+       bool dcp_ab;
+       /** Gain to apply to audio in dB */
+       float audio_gain;
+       /** Delay to apply to audio (positive moves audio later) in milliseconds */
+       int audio_delay;
+       /** Duration to make still-sourced films (in seconds) */
+       int still_duration;
+
+       /* Data which is cached to speed things up */
+
+       /** Vector of frame indices for each of our `thumbnails */
+       std::vector<int> thumbs;
+       /** Size, in pixels, of the source (ignoring cropping) */
+       Size size;
+       /** Length in frames */
+       int length;
+       /** Number of audio channels */
+       int audio_channels;
+       /** Sample rate of the audio, in Hz */
+       int audio_sample_rate;
+       /** Format of the audio samples */
+       AVSampleFormat audio_sample_format;
+
+private:
+       std::string thumb_file_for_frame (int) const;
+};
+
+#endif

diff --git a/src/lib/filter.cc b/src/lib/filter.cc
new file mode 100644 (file)
index 0000000..ab5a631
--- /dev/null
+++ b/src/lib/filter.cc
@@ -0,0 +1,131 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/filter.cc
+ *  @brief A class to describe one of FFmpeg's video or post-processing filters.
+ */
+
+#include "filter.h"
+
+using namespace std;
+
+vector<Filter const *> Filter::_filters;
+
+/** @param i Our id.
+ *  @param n User-visible name.
+ *  @param v String for a FFmpeg video filter descriptor, or "".
+ *  @param p String for a FFmpeg post-processing descriptor, or "".
+ */
+Filter::Filter (string i, string n, string v, string p)
+       : _id (i)
+       , _name (n)
+       , _vf (v)
+       , _pp (p)
+{
+
+}
+
+/** @return All available filters */
+vector<Filter const *>
+Filter::all ()
+{
+       return _filters;
+}
+
+
+/** Set up the static _filters vector; must be called before from_*
+ *  methods are used.
+ */
+void
+Filter::setup_filters ()
+{
+       /* Note: "none" is a magic id name, so don't use it here */
+          
+       _filters.push_back (new Filter ("pphb", "Horizontal deblocking filter", "", "hb"));
+       _filters.push_back (new Filter ("ppvb", "Vertical deblocking filter", "", "vb"));
+       _filters.push_back (new Filter ("ppha", "Horizontal deblocking filter A", "", "ha"));
+       _filters.push_back (new Filter ("ppva", "Vertical deblocking filter A", "", "va"));
+       _filters.push_back (new Filter ("pph1", "Experimental horizontal deblocking filter 1", "", "h1"));
+       _filters.push_back (new Filter ("pphv", "Experimental vertical deblocking filter 1", "", "v1"));
+       _filters.push_back (new Filter ("ppdr", "Deringing filter", "", "dr"));
+       _filters.push_back (new Filter ("pplb", "Linear blend deinterlacer", "", "lb"));
+       _filters.push_back (new Filter ("ppli", "Linear interpolating deinterlacer", "", "li"));
+       _filters.push_back (new Filter ("ppci", "Cubic interpolating deinterlacer", "", "ci"));
+       _filters.push_back (new Filter ("ppmd", "Median deinterlacer", "", "md"));
+       _filters.push_back (new Filter ("ppfd", "FFMPEG deinterlacer", "", "fd"));
+       _filters.push_back (new Filter ("ppl5", "FIR low-pass deinterlacer", "", "l5"));
+       _filters.push_back (new Filter ("mcdeint", "Motion compensating deinterlacer", "mcdeint", ""));
+       _filters.push_back (new Filter ("kerndeint", "Kernel deinterlacer", "kerndeint", ""));
+       _filters.push_back (new Filter ("pptn", "Temporal noise reducer", "", "tn"));
+       _filters.push_back (new Filter ("ppfq", "Force quantizer", "", "fq"));
+       _filters.push_back (new Filter ("gradfun", "Gradient debander", "gradfun", ""));
+       _filters.push_back (new Filter ("unsharp", "Unsharp mask and Gaussian blur", "unsharp", ""));
+       _filters.push_back (new Filter ("denoise3d", "3D denoiser", "denoise3d", ""));
+       _filters.push_back (new Filter ("hqdn3d", "High quality 3D denoiser", "hqdn3d", ""));
+       _filters.push_back (new Filter ("telecine", "Telecine filter", "telecine", ""));
+       _filters.push_back (new Filter ("ow", "Overcomplete wavelet denoiser", "mp=ow", ""));
+}
+
+/** @param filters Set of filters.
+ *  @return A pair; .first is a string to pass to FFmpeg for the video filters,
+ *  .second is a string to pass for the post-processors.
+ */
+pair<string, string>
+Filter::ffmpeg_strings (vector<Filter const *> const & filters)
+{
+       string vf;
+       string pp;
+
+       for (vector<Filter const *>::const_iterator i = filters.begin(); i != filters.end(); ++i) {
+               if (!(*i)->vf().empty ()) {
+                       if (!vf.empty ()) {
+                               vf += ",";
+                       }
+                       vf += (*i)->vf ();
+               }
+               
+               if (!(*i)->pp().empty ()) {
+                       if (!pp.empty()) {
+                               pp += ",";
+                       }
+                       pp += (*i)->pp ();
+               }
+       }
+
+       return make_pair (vf, pp);
+}
+
+/** @param d Our id.
+ *  @return Corresponding Filter, or 0.
+ */
+Filter const *
+Filter::from_id (string d)
+{
+       vector<Filter const *>::iterator i = _filters.begin ();
+       while (i != _filters.end() && (*i)->id() != d) {
+               ++i;
+       }
+
+       if (i == _filters.end ()) {
+               return 0;
+       }
+
+       return *i;
+}
+

diff --git a/src/lib/filter.h b/src/lib/filter.h
new file mode 100644 (file)
index 0000000..20c5504
--- /dev/null
+++ b/src/lib/filter.h
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/filter.h
+ *  @brief A class to describe one of FFmpeg's video or post-processing filters.
+ */
+
+#ifndef DVDOMATIC_FILTER_H
+#define DVDOMATIC_FILTER_H
+
+#include <string>
+#include <vector>
+
+/** @class Filter
+ *  @brief A class to describe one of FFmpeg's video or post-processing filters.
+ */
+class Filter
+{
+public:
+       Filter (std::string, std::string, std::string, std::string);
+
+       /** @return our id */
+       std::string id () const {
+               return _id;
+       }
+
+       /** @return user-visible name */
+       std::string name () const {
+               return _name;
+       }
+
+       /** @return string for a FFmpeg video filter descriptor */
+       std::string vf () const {
+               return _vf;
+       }
+       
+       /** @return string for a FFmpeg post-processing descriptor */
+       std::string pp () const {
+               return _pp;
+       }
+       
+       static std::vector<Filter const *> all ();
+       static Filter const * from_id (std::string);
+       static void setup_filters ();
+       static std::pair<std::string, std::string> ffmpeg_strings (std::vector<Filter const *> const &);
+
+private:
+
+       /** our id */
+       std::string _id;
+       /** user-visible name */
+       std::string _name;
+       /** string for a FFmpeg video filter descriptor */
+       std::string _vf;
+       /** string for a FFmpeg post-processing descriptor */
+       std::string _pp;
+
+       /** all available filters */
+       static std::vector<Filter const *> _filters;
+};
+
+#endif

diff --git a/src/lib/format.cc b/src/lib/format.cc
new file mode 100644 (file)
index 0000000..dcc8844
--- /dev/null
+++ b/src/lib/format.cc
@@ -0,0 +1,189 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/format.cc
+ *  @brief Class to describe a format (aspect ratio) that a Film should
+ *  be shown in.
+ */
+
+#include <sstream>
+#include <cstdlib>
+#include <cassert>
+#include <iomanip>
+#include <iostream>
+#include "format.h"
+
+using namespace std;
+
+vector<Format const *> Format::_formats;
+
+/** @param r Ratio multiplied by 100 (e.g. 185)
+ *  @param dcp Size (in pixels) of the images that we should put in a DCP.
+ *  @param id ID (e.g. 185)
+ *  @param n Nick name (e.g. Flat)
+ */
+Format::Format (int r, Size dcp, string id, string n)
+       : _ratio (r)
+       , _dcp_size (dcp)
+       , _id (id)
+       , _nickname (n)
+{
+
+}
+
+/** @return A name to be presented to the user */
+string
+Format::name () const
+{
+       stringstream s;
+       if (!_nickname.empty ()) {
+               s << _nickname << " (";
+       }
+
+       s << setprecision(3) << (_ratio / 100.0) << ":1";
+
+       if (!_nickname.empty ()) {
+               s << ")";
+       }
+
+       return s.str ();
+}
+
+/** @return Identifier for this format as metadata for a Film's metadata file */
+string
+Format::as_metadata () const
+{
+       return _id;
+}
+
+/** Fill our _formats vector with all available formats */
+void
+Format::setup_formats ()
+{
+       _formats.push_back (new Format (133, Size (1998, 1080), "133-in-flat", "4:3 within Flat"));
+       _formats.push_back (new Format (137, Size (1480, 1080), "137", "Academy"));
+       _formats.push_back (new Format (178, Size (1998, 1080), "178-in-flat", "16:9 within Flat"));
+       _formats.push_back (new Format (185, Size (1998, 1080), "185", "Flat"));
+       _formats.push_back (new Format (239, Size (2048, 858), "239", "Scope"));
+}
+
+/** @param r Ratio multiplied by 100.
+ *  @return Matching Format, or 0.
+ */
+Format const *
+Format::from_ratio (int r)
+{
+       vector<Format const *>::iterator i = _formats.begin ();
+       while (i != _formats.end() && (*i)->ratio_as_integer() != r) {
+               ++i;
+       }
+
+       if (i == _formats.end ()) {
+               return 0;
+       }
+
+       return *i;
+}
+
+/** @param n Nickname.
+ *  @return Matching Format, or 0.
+ */
+Format const *
+Format::from_nickname (string n)
+{
+       vector<Format const *>::iterator i = _formats.begin ();
+       while (i != _formats.end() && (*i)->nickname() != n) {
+               ++i;
+       }
+
+       if (i == _formats.end ()) {
+               return 0;
+       }
+
+       return *i;
+}
+
+/** @param i Id.
+ *  @return Matching Format, or 0.
+ */
+Format const *
+Format::from_id (string i)
+{
+       vector<Format const *>::iterator j = _formats.begin ();
+       while (j != _formats.end() && (*j)->id() != i) {
+               ++j;
+       }
+
+       if (j == _formats.end ()) {
+               return 0;
+       }
+
+       return *j;
+}
+
+
+/** @param m Metadata, as returned from as_metadata().
+ *  @return Matching Format, or 0.
+ */
+Format const *
+Format::from_metadata (string m)
+{
+       return from_id (m);
+}
+
+/** @param f A Format.
+ *  @return Index of f within our static list, or -1.
+ */
+int
+Format::as_index (Format const * f)
+{
+       vector<Format*>::size_type i = 0;
+       while (i < _formats.size() && _formats[i] != f) {
+               ++i;
+       }
+
+       if (i == _formats.size ()) {
+               return -1;
+       }
+
+       return i;
+}
+
+/** @param i An index returned from as_index().
+ *  @return Corresponding Format.
+ */
+Format const *
+Format::from_index (int i)
+{
+       assert (i >= 0 && i < int(_formats.size ()));
+       return _formats[i];
+}
+
+/** @return All available formats */
+vector<Format const *>
+Format::all ()
+{
+       return _formats;
+}
+
+int
+Format::dcp_padding () const
+{
+       return rint ((_dcp_size.width - (_dcp_size.height * _ratio / 100.0)) / 2.0);
+}

diff --git a/src/lib/format.h b/src/lib/format.h
new file mode 100644 (file)
index 0000000..4b727b2
--- /dev/null
+++ b/src/lib/format.h
@@ -0,0 +1,101 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/format.h
+ *  @brief Class to describe a format (aspect ratio) that a Film should
+ *  be shown in.
+ */
+
+#include <string>
+#include <vector>
+#include "util.h"
+
+/** @class Format
+ *  @brief Class to describe a format (aspect ratio) that a Film should
+ *  be shown in.
+ */
+class Format
+{
+public:
+       Format (int, Size, std::string, std::string);
+
+       /** @return the aspect ratio multiplied by 100
+        *  (e.g. 239 for Cinemascope 2.39:1)
+        */
+       int ratio_as_integer () const {
+               return _ratio;
+       }
+
+       /** @return the ratio as a floating point number */
+       float ratio_as_float () const {
+               return _ratio / 100.0;
+       }
+
+       /** @return size in pixels of the images that we should
+        *  put in a DCP for this ratio.  This size will not correspond
+        *  to the ratio when we are doing things like 16:9 in a Flat frame.
+        */
+       Size dcp_size () const {
+               return _dcp_size;
+       }
+
+       std::string id () const {
+               return _id;
+       }
+
+       /** @return Full name to present to the user */
+       std::string name () const;
+
+       /** @return Nickname (e.g. Flat, Scope) */
+       std::string nickname () const {
+               return _nickname;
+       }
+
+       std::string as_metadata () const;
+
+       int dcp_padding () const;
+
+       static Format const * from_ratio (int);
+       static Format const * from_nickname (std::string n);
+       static Format const * from_metadata (std::string m);
+       static Format const * from_index (int i);
+       static Format const * from_id (std::string i);
+       static int as_index (Format const * f);
+       static std::vector<Format const *> all ();
+       static void setup_formats ();
+       
+private:
+
+       /** Ratio expressed as the actual ratio multiplied by 100 */
+       int _ratio;
+       /** Size in pixels of the images that we should
+        *  put in a DCP for this ratio.  This size will not correspond
+        *  to the ratio when we are doing things like 16:9 in a Flat frame.
+        */
+       Size _dcp_size;
+       /** id for use in metadata */
+       std::string _id;
+       /** nickname (e.g. Flat, Scope) */
+       std::string _nickname;
+
+       /** all available formats */
+       static std::vector<Format const *> _formats;
+};
+
+       

diff --git a/src/lib/image.cc b/src/lib/image.cc
new file mode 100644 (file)
index 0000000..7a9ac7d
--- /dev/null
+++ b/src/lib/image.cc
@@ -0,0 +1,392 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/image.cc
+ *  @brief A set of classes to describe video images.
+ */
+
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+#include <execinfo.h>
+#include <cxxabi.h>
+#include <sys/time.h>
+#include <boost/algorithm/string.hpp>
+#include <openjpeg.h>
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libswresample/swresample.h>
+#include <libavfilter/avfiltergraph.h>
+#include <libavfilter/avcodec.h>
+#include <libavfilter/buffersink.h>
+#include <libpostproc/postprocess.h>
+#include <libavutil/pixfmt.h>
+}
+#include "image.h"
+#include "exceptions.h"
+#include "scaler.h"
+
+#ifdef DEBUG_HASH
+#include <mhash.h>
+#endif
+
+using namespace std;
+using namespace boost;
+
+/** @param n Component index.
+ *  @return Number of lines in the image for the given component.
+ */
+int
+Image::lines (int n) const
+{
+       switch (_pixel_format) {
+       case PIX_FMT_YUV420P:
+               if (n == 0) {
+                       return size().height;
+               } else {
+                       return size().height / 2;
+               }
+               break;
+       case PIX_FMT_RGB24:
+               return size().height;
+       default:
+               assert (false);
+       }
+
+       return 0;
+}
+
+/** @return Number of components */
+int
+Image::components () const
+{
+       switch (_pixel_format) {
+       case PIX_FMT_YUV420P:
+               return 3;
+       case PIX_FMT_RGB24:
+               return 1;
+       default:
+               assert (false);
+       }
+
+       return 0;
+}
+
+#ifdef DEBUG_HASH
+/** Write a MD5 hash of the image's data to stdout.
+ *  @param n Title to give the output.
+ */
+void
+Image::hash (string n) const
+{
+       MHASH ht = mhash_init (MHASH_MD5);
+       if (ht == MHASH_FAILED) {
+               throw EncodeError ("could not create hash thread");
+       }
+       
+       for (int i = 0; i < components(); ++i) {
+               mhash (ht, data()[i], line_size()[i] * lines(i));
+       }
+       
+       uint8_t hash[16];
+       mhash_deinit (ht, hash);
+       
+       printf ("%s: ", n.c_str ());
+       for (int i = 0; i < int (mhash_get_block_size (MHASH_MD5)); ++i) {
+               printf ("%.2x", hash[i]);
+       }
+       printf ("\n");
+}
+#endif
+
+/** Scale this image to a given size and convert it to RGB.
+ *  @param out_size Output image size in pixels.
+ *  @param scaler Scaler to use.
+ */
+shared_ptr<RGBFrameImage>
+Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scaler) const
+{
+       assert (scaler);
+
+       Size content_size = out_size;
+       content_size.width -= (padding * 2);
+
+       shared_ptr<RGBFrameImage> rgb (new RGBFrameImage (content_size));
+       
+       struct SwsContext* scale_context = sws_getContext (
+               size().width, size().height, pixel_format(),
+               content_size.width, content_size.height, PIX_FMT_RGB24,
+               scaler->ffmpeg_id (), 0, 0, 0
+               );
+
+       /* Scale and convert to RGB from whatever its currently in (which may be RGB) */
+       sws_scale (
+               scale_context,
+               data(), line_size(),
+               0, size().height,
+               rgb->data (), rgb->line_size ()
+               );
+
+       /* Put the image in the right place in a black frame if are padding; this is
+          a bit grubby and expensive, but probably inconsequential in the great
+          scheme of things.
+       */
+       if (padding > 0) {
+               shared_ptr<RGBFrameImage> padded_rgb (new RGBFrameImage (out_size));
+               padded_rgb->make_black ();
+
+               /* XXX: we are cheating a bit here; we know the frame is RGB so we can
+                  make assumptions about its composition.
+               */
+               uint8_t* p = padded_rgb->data()[0] + padding * 3;
+               uint8_t* q = rgb->data()[0];
+               for (int j = 0; j < rgb->lines(0); ++j) {
+                       memcpy (p, q, rgb->line_size()[0]);
+                       p += padded_rgb->line_size()[0];
+                       q += rgb->line_size()[0];
+               }
+
+               rgb = padded_rgb;
+       }
+
+       sws_freeContext (scale_context);
+
+       return rgb;
+}
+
+/** Run a FFmpeg post-process on this image and return the processed version.
+ *  @param pp Flags for the required set of post processes.
+ *  @return Post-processed image.
+ */
+shared_ptr<PostProcessImage>
+Image::post_process (string pp) const
+{
+       shared_ptr<PostProcessImage> out (new PostProcessImage (PIX_FMT_YUV420P, size ()));
+       
+       pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX);
+       pp_context* context = pp_get_context (size().width, size().height, PP_FORMAT_420 | PP_CPU_CAPS_MMX2);
+
+       pp_postprocess (
+               (const uint8_t **) data(), line_size(),
+               out->data(), out->line_size(),
+               size().width, size().height,
+               0, 0, mode, context, 0
+               );
+               
+       pp_free_mode (mode);
+       pp_free_context (context);
+
+       return out;
+}
+
+void
+Image::make_black ()
+{
+       switch (_pixel_format) {
+       case PIX_FMT_YUV420P:
+               memset (data()[0], 0, lines(0) * line_size()[0]);
+               memset (data()[1], 0x80, lines(1) * line_size()[1]);
+               memset (data()[2], 0x80, lines(2) * line_size()[2]);
+               break;
+
+       case PIX_FMT_RGB24:             
+               memset (data()[0], 0, lines(0) * line_size()[0]);
+               break;
+
+       default:
+               assert (false);
+       }
+}
+
+/** Construct a SimpleImage of a given size and format, allocating memory
+ *  as required.
+ *
+ *  @param p Pixel format.
+ *  @param s Size in pixels.
+ */
+SimpleImage::SimpleImage (PixelFormat p, Size s)
+       : Image (p)
+       , _size (s)
+{
+       _data = (uint8_t **) av_malloc (components() * sizeof (uint8_t *));
+       _line_size = (int *) av_malloc (components() * sizeof (int));
+       
+       for (int i = 0; i < components(); ++i) {
+               _data[i] = 0;
+               _line_size[i] = 0;
+       }
+}
+
+/** Destroy a SimpleImage */
+SimpleImage::~SimpleImage ()
+{
+       for (int i = 0; i < components(); ++i) {
+               av_free (_data[i]);
+       }
+
+       av_free (_data);
+       av_free (_line_size);
+}
+
+/** Set the size in bytes of each horizontal line of a given component.
+ *  @param i Component index.
+ *  @param s Size of line in bytes.
+ */
+void
+SimpleImage::set_line_size (int i, int s)
+{
+       _line_size[i] = s;
+       _data[i] = (uint8_t *) av_malloc (s * lines (i));
+}
+
+uint8_t **
+SimpleImage::data () const
+{
+       return _data;
+}
+
+int *
+SimpleImage::line_size () const
+{
+       return _line_size;
+}
+
+Size
+SimpleImage::size () const
+{
+       return _size;
+}
+
+
+FilterBufferImage::FilterBufferImage (PixelFormat p, AVFilterBufferRef* b)
+       : Image (p)
+       , _buffer (b)
+{
+
+}
+
+FilterBufferImage::~FilterBufferImage ()
+{
+       avfilter_unref_buffer (_buffer);
+}
+
+uint8_t **
+FilterBufferImage::data () const
+{
+       return _buffer->data;
+}
+
+int *
+FilterBufferImage::line_size () const
+{
+       return _buffer->linesize;
+}
+
+Size
+FilterBufferImage::size () const
+{
+       return Size (_buffer->video->w, _buffer->video->h);
+}
+
+/** XXX: this could be generalised to use any format, but I don't
+ *  understand how avpicture_fill is supposed to be called with
+ *  multi-planar images.
+ */
+RGBFrameImage::RGBFrameImage (Size s)
+       : Image (PIX_FMT_RGB24)
+       , _size (s)
+{
+       _frame = avcodec_alloc_frame ();
+       if (_frame == 0) {
+               throw EncodeError ("could not allocate frame");
+       }
+
+       _data = (uint8_t *) av_malloc (size().width * size().height * 3);
+       avpicture_fill ((AVPicture *) _frame, _data, PIX_FMT_RGB24, size().width, size().height);
+       _frame->width = size().width;
+       _frame->height = size().height;
+       _frame->format = PIX_FMT_RGB24;
+}
+
+RGBFrameImage::~RGBFrameImage ()
+{
+       av_free (_data);
+       av_free (_frame);
+}
+
+uint8_t **
+RGBFrameImage::data () const
+{
+       return _frame->data;
+}
+
+int *
+RGBFrameImage::line_size () const
+{
+       return _frame->linesize;
+}
+
+Size
+RGBFrameImage::size () const
+{
+       return _size;
+}
+
+PostProcessImage::PostProcessImage (PixelFormat p, Size s)
+       : Image (p)
+       , _size (s)
+{
+       _data = new uint8_t*[4];
+       _line_size = new int[4];
+       
+       for (int i = 0; i < 4; ++i) {
+               _data[i] = (uint8_t *) av_malloc (s.width * s.height);
+               _line_size[i] = s.width;
+       }
+}
+
+PostProcessImage::~PostProcessImage ()
+{
+       for (int i = 0; i < 4; ++i) {
+               av_free (_data[i]);
+       }
+       
+       delete[] _data;
+       delete[] _line_size;
+}
+
+uint8_t **
+PostProcessImage::data () const
+{
+       return _data;
+}
+
+int *
+PostProcessImage::line_size () const
+{
+       return _line_size;
+}
+
+Size
+PostProcessImage::size () const
+{
+       return _size;
+}

diff --git a/src/lib/image.h b/src/lib/image.h
new file mode 100644 (file)
index 0000000..97ab1d5
--- /dev/null
+++ b/src/lib/image.h
@@ -0,0 +1,164 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/image.h
+ *  @brief A set of classes to describe video images.
+ */
+
+#ifndef DVDOMATIC_IMAGE_H
+#define DVDOMATIC_IMAGE_H
+
+#include <string>
+#include <boost/shared_ptr.hpp>
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavfilter/avfilter.h>
+}
+#include "util.h"
+
+class Scaler;
+class RGBFrameImage;
+class PostProcessImage;
+
+/** @class Image
+ *  @brief Parent class for wrappers of some image, in some format, that
+ *  can present a set of components and a size in pixels.
+ *
+ *  This class also has some conversion / processing methods.
+ *
+ *  The main point of this class (and its subclasses) is to abstract
+ *  details of FFmpeg's memory management and varying data formats.
+ */
+class Image
+{
+public:
+       Image (PixelFormat p)
+               : _pixel_format (p)
+       {}
+       
+       virtual ~Image () {}
+
+       /** @return Array of pointers to arrays of the component data */
+       virtual uint8_t ** data () const = 0;
+
+       /** @return Array of sizes of each line, in pixels */
+       virtual int * line_size () const = 0;
+
+       /** @return Size of the image, in pixels */
+       virtual Size size () const = 0;
+
+       int components () const;
+       int lines (int) const;
+       boost::shared_ptr<RGBFrameImage> scale_and_convert_to_rgb (Size, int, Scaler const *) const;
+       boost::shared_ptr<PostProcessImage> post_process (std::string) const;
+       
+#ifdef DEBUG_HASH      
+       void hash (std::string) const;
+#endif
+
+       void make_black ();
+       
+       PixelFormat pixel_format () const {
+               return _pixel_format;
+       }
+
+private:
+       PixelFormat _pixel_format; ///< FFmpeg's way of describing the pixel format of this Image
+};
+
+/** @class FilterBufferImage
+ *  @brief An Image that is held in an AVFilterBufferRef.
+ */
+class FilterBufferImage : public Image
+{
+public:
+       FilterBufferImage (PixelFormat, AVFilterBufferRef *);
+       ~FilterBufferImage ();
+
+       uint8_t ** data () const;
+       int * line_size () const;
+       Size size () const;
+
+private:
+       AVFilterBufferRef* _buffer;
+};
+
+/** @class SimpleImage
+ *  @brief An Image for which memory is allocated using a `simple' av_malloc().
+ */
+class SimpleImage : public Image
+{
+public:
+       SimpleImage (PixelFormat, Size);
+       ~SimpleImage ();
+
+       uint8_t ** data () const;
+       int * line_size () const;
+       Size size () const;
+       
+       void set_line_size (int, int);
+
+private:
+       Size _size; ///< size in pixels
+       uint8_t** _data; ///< array of pointers to components
+       int* _line_size; ///< array of widths of each line, in bytes
+};
+
+/** @class RGBFrameImage
+ *  @brief An RGB image that is held within an AVFrame.
+ */
+class RGBFrameImage : public Image
+{
+public:
+       RGBFrameImage (Size);
+       ~RGBFrameImage ();
+
+       uint8_t ** data () const;
+       int * line_size () const;
+       Size size () const;
+       AVFrame * frame () const {
+               return _frame;
+       }
+
+private:
+       Size _size;
+       AVFrame* _frame;
+       uint8_t* _data;
+};
+
+/** @class PostProcessImage
+ *  @brief An image that is the result of an FFmpeg post-processing run.
+ */
+class PostProcessImage : public Image
+{
+public:
+       PostProcessImage (PixelFormat, Size);
+       ~PostProcessImage ();
+
+       uint8_t ** data () const;
+       int * line_size () const;
+       Size size () const;
+
+private:
+       Size _size;
+       uint8_t** _data;
+       int* _line_size;
+};
+
+#endif

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
new file mode 100644 (file)
index 0000000..7cee01e
--- /dev/null
+++ b/src/lib/imagemagick_decoder.cc
@@ -0,0 +1,55 @@
+#include <iostream>
+#include <Magick++/Image.h>
+#include "imagemagick_decoder.h"
+#include "film_state.h"
+#include "image.h"
+
+using namespace std;
+
+ImageMagickDecoder::ImageMagickDecoder (
+       boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Job* j, Log* l, bool minimal, bool ignore_length)
+       : Decoder (s, o, j, l, minimal, ignore_length)
+       , _done (false)
+{
+       _magick_image = new Magick::Image (_fs->content_path ());
+}
+
+Size
+ImageMagickDecoder::native_size () const
+{
+       return Size (_magick_image->columns(), _magick_image->rows());
+}
+
+bool
+ImageMagickDecoder::do_pass ()
+{
+       if (_done) {
+               return true;
+       }
+
+       Size size = native_size ();
+       RGBFrameImage image (size);
+
+       uint8_t* p = image.data()[0];
+       for (int y = 0; y < size.height; ++y) {
+               for (int x = 0; x < size.width; ++x) {
+                       Magick::Color c = _magick_image->pixelColor (x, y);
+                       *p++ = c.redQuantum() * 255 / MaxRGB;
+                       *p++ = c.greenQuantum() * 255 / MaxRGB;
+                       *p++ = c.blueQuantum() * 255 / MaxRGB;
+               }
+
+       }
+       
+       process_video (image.frame ());
+
+       _done = true;
+       return false;
+}
+
+PixelFormat
+ImageMagickDecoder::pixel_format () const
+{
+       return PIX_FMT_RGB24;
+}
+

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
new file mode 100644 (file)
index 0000000..707e6ca
--- /dev/null
+++ b/src/lib/imagemagick_decoder.h
@@ -0,0 +1,63 @@
+#include "decoder.h"
+
+namespace Magick {
+       class Image;
+}
+
+class ImageMagickDecoder : public Decoder
+{
+public:
+       ImageMagickDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+
+       int length_in_frames () const {
+               return 1;
+       }
+
+       float frames_per_second () const {
+               return static_frames_per_second ();
+       }
+
+       Size native_size () const;
+
+       int audio_channels () const {
+               return 0;
+       }
+
+       int audio_sample_rate () const {
+               return 0;
+       }
+
+       AVSampleFormat audio_sample_format () const {
+               return AV_SAMPLE_FMT_NONE;
+       }
+
+       static float static_frames_per_second () {
+               return 24;
+       }
+
+protected:
+       bool do_pass ();
+       PixelFormat pixel_format () const;
+
+       int time_base_numerator () const {
+               return 0;
+       }
+
+       int time_base_denominator () const {
+               return 0;
+       }
+
+       int sample_aspect_ratio_numerator () const {
+               /* XXX */
+               return 1;
+       }
+
+       int sample_aspect_ratio_denominator () const {
+               /* XXX */
+               return 1;
+       }
+
+private:
+       Magick::Image* _magick_image;
+       bool _done;
+};

diff --git a/src/lib/j2k_still_encoder.cc b/src/lib/j2k_still_encoder.cc
new file mode 100644 (file)
index 0000000..f68bc58
--- /dev/null
+++ b/src/lib/j2k_still_encoder.cc
@@ -0,0 +1,73 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/j2k_wav_encoder.cc
+ *  @brief An encoder which writes JPEG2000 and WAV files.
+ */
+
+#include <sstream>
+#include <stdexcept>
+#include <iomanip>
+#include <iostream>
+#include <boost/filesystem.hpp>
+#include <sndfile.h>
+#include <openjpeg.h>
+#include "j2k_still_encoder.h"
+#include "config.h"
+#include "film_state.h"
+#include "options.h"
+#include "exceptions.h"
+#include "dcp_video_frame.h"
+#include "filter.h"
+#include "log.h"
+#include "imagemagick_decoder.h"
+
+using namespace std;
+using namespace boost;
+
+J2KStillEncoder::J2KStillEncoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : Encoder (s, o, l)
+{
+       
+}
+
+void
+J2KStillEncoder::process_video (shared_ptr<Image> yuv, int frame)
+{
+       pair<string, string> const s = Filter::ffmpeg_strings (_fs->filters);
+       DCPVideoFrame* f = new DCPVideoFrame (
+               yuv, _opt->out_size, _opt->padding, _fs->scaler, 0, _fs->frames_per_second, s.second,
+               Config::instance()->colour_lut_index(), Config::instance()->j2k_bandwidth(),
+               _log
+               );
+
+       if (!boost::filesystem::exists (_opt->frame_out_path (1, false))) {
+               boost::shared_ptr<EncodedData> e = f->encode_locally ();
+               e->write (_opt, 1);
+       }
+
+       string const real = _opt->frame_out_path (1, false);
+       for (int i = 2; i <= (_fs->still_duration * ImageMagickDecoder::static_frames_per_second()); ++i) {
+               if (!boost::filesystem::exists (_opt->frame_out_path (i, false))) {
+                       string const link = _opt->frame_out_path (i, false);
+                       symlink (real.c_str(), link.c_str());
+               }
+               frame_done ();
+       }
+}

diff --git a/src/lib/j2k_still_encoder.h b/src/lib/j2k_still_encoder.h
new file mode 100644 (file)
index 0000000..d4d6872
--- /dev/null
+++ b/src/lib/j2k_still_encoder.h
@@ -0,0 +1,43 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/j2k_wav_encoder.h
+ *  @brief An encoder which writes JPEG2000 and WAV files.
+ */
+
+#include <list>
+#include <vector>
+#include "encoder.h"
+
+class Image;
+class Log;
+
+/** @class J2KStillEncoder
+ *  @brief An encoder which writes repeated JPEG2000 files from a single decoded input.
+ */
+class J2KStillEncoder : public Encoder
+{
+public:
+       J2KStillEncoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Log *);
+
+       void process_begin () {}
+       void process_video (boost::shared_ptr<Image>, int);
+       void process_audio (uint8_t *, int) {}
+       void process_end () {}
+};

diff --git a/src/lib/j2k_wav_encoder.cc b/src/lib/j2k_wav_encoder.cc
new file mode 100644 (file)
index 0000000..e6a1b28
--- /dev/null
+++ b/src/lib/j2k_wav_encoder.cc
@@ -0,0 +1,289 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/j2k_wav_encoder.cc
+ *  @brief An encoder which writes JPEG2000 and WAV files.
+ */
+
+#include <sstream>
+#include <stdexcept>
+#include <iomanip>
+#include <iostream>
+#include <boost/thread.hpp>
+#include <boost/filesystem.hpp>
+#include <sndfile.h>
+#include <openjpeg.h>
+#include "j2k_wav_encoder.h"
+#include "config.h"
+#include "film_state.h"
+#include "options.h"
+#include "exceptions.h"
+#include "dcp_video_frame.h"
+#include "server.h"
+#include "filter.h"
+#include "log.h"
+
+using namespace std;
+using namespace boost;
+
+J2KWAVEncoder::J2KWAVEncoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : Encoder (s, o, l)
+       , _deinterleave_buffer_size (8192)
+       , _deinterleave_buffer (0)
+       , _process_end (false)
+{
+       /* Create sound output files with .tmp suffixes; we will rename
+          them if and when we complete.
+       */
+       for (int i = 0; i < _fs->audio_channels; ++i) {
+               SF_INFO sf_info;
+               sf_info.samplerate = _fs->audio_sample_rate;
+               /* We write mono files */
+               sf_info.channels = 1;
+               sf_info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_24;
+               SNDFILE* f = sf_open (_opt->multichannel_audio_out_path (i, true).c_str (), SFM_WRITE, &sf_info);
+               if (f == 0) {
+                       throw CreateFileError (_opt->multichannel_audio_out_path (i, true));
+               }
+               _sound_files.push_back (f);
+       }
+
+       /* Create buffer for deinterleaving audio */
+       _deinterleave_buffer = new uint8_t[_deinterleave_buffer_size];
+}
+
+J2KWAVEncoder::~J2KWAVEncoder ()
+{
+       terminate_worker_threads ();
+       delete[] _deinterleave_buffer;
+       close_sound_files ();
+}
+
+void
+J2KWAVEncoder::terminate_worker_threads ()
+{
+       boost::mutex::scoped_lock lock (_worker_mutex);
+       _process_end = true;
+       _worker_condition.notify_all ();
+       lock.unlock ();
+
+       for (list<boost::thread *>::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) {
+               (*i)->join ();
+               delete *i;
+       }
+}
+
+void
+J2KWAVEncoder::close_sound_files ()
+{
+       for (vector<SNDFILE*>::iterator i = _sound_files.begin(); i != _sound_files.end(); ++i) {
+               sf_close (*i);
+       }
+
+       _sound_files.clear ();
+}      
+
+void
+J2KWAVEncoder::process_video (shared_ptr<Image> yuv, int frame)
+{
+       boost::mutex::scoped_lock lock (_worker_mutex);
+
+       /* Wait until the queue has gone down a bit */
+       while (_queue.size() >= _worker_threads.size() * 2 && !_process_end) {
+               _worker_condition.wait (lock);
+       }
+
+       if (_process_end) {
+               return;
+       }
+
+       /* Only do the processing if we don't already have a file for this frame */
+       if (!boost::filesystem::exists (_opt->frame_out_path (frame, false))) {
+               pair<string, string> const s = Filter::ffmpeg_strings (_fs->filters);
+               _queue.push_back (boost::shared_ptr<DCPVideoFrame> (
+                                         new DCPVideoFrame (
+                                                 yuv, _opt->out_size, _opt->padding, _fs->scaler, frame, _fs->frames_per_second, s.second,
+                                                 Config::instance()->colour_lut_index (), Config::instance()->j2k_bandwidth (),
+                                                 _log
+                                                 )
+                                         ));
+               
+               _worker_condition.notify_all ();
+       }
+}
+
+void
+J2KWAVEncoder::encoder_thread (Server* server)
+{
+       /* Number of seconds that we currently wait between attempts
+          to connect to the server; not relevant for localhost
+          encodings.
+       */
+       int remote_backoff = 0;
+       
+       while (1) {
+               boost::mutex::scoped_lock lock (_worker_mutex);
+               while (_queue.empty () && !_process_end) {
+                       _worker_condition.wait (lock);
+               }
+
+               if (_process_end) {
+                       return;
+               }
+
+               boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
+               _queue.pop_front ();
+               
+               lock.unlock ();
+
+               shared_ptr<EncodedData> encoded;
+
+               if (server) {
+                       try {
+                               encoded = vf->encode_remotely (server);
+
+                               if (remote_backoff > 0) {
+                                       stringstream s;
+                                       s << server->host_name() << " was lost, but now she is found; removing backoff";
+                                       _log->log (s.str ());
+                               }
+                               
+                               /* This job succeeded, so remove any backoff */
+                               remote_backoff = 0;
+                               
+                       } catch (std::exception& e) {
+                               if (remote_backoff < 60) {
+                                       /* back off more */
+                                       remote_backoff += 10;
+                               }
+                               stringstream s;
+                               s << "Remote encode on " << server->host_name() << " failed (" << e.what() << "); thread sleeping for " << remote_backoff << "s.";
+                               _log->log (s.str ());
+                       }
+                               
+               } else {
+                       try {
+                               encoded = vf->encode_locally ();
+                       } catch (std::exception& e) {
+                               stringstream s;
+                               s << "Local encode failed " << e.what() << ".";
+                               _log->log (s.str ());
+                       }
+               }
+
+               if (encoded) {
+                       encoded->write (_opt, vf->frame ());
+                       frame_done ();
+               } else {
+                       lock.lock ();
+                       _queue.push_front (vf);
+                       lock.unlock ();
+               }
+
+               if (remote_backoff > 0) {
+                       sleep (remote_backoff);
+               }
+
+               lock.lock ();
+               _worker_condition.notify_all ();
+       }
+}
+
+void
+J2KWAVEncoder::process_begin ()
+{
+       for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
+               _worker_threads.push_back (new boost::thread (boost::bind (&J2KWAVEncoder::encoder_thread, this, (Server *) 0)));
+       }
+
+       vector<Server*> servers = Config::instance()->servers ();
+
+       for (vector<Server*>::iterator i = servers.begin(); i != servers.end(); ++i) {
+               for (int j = 0; j < (*i)->threads (); ++j) {
+                       _worker_threads.push_back (new boost::thread (boost::bind (&J2KWAVEncoder::encoder_thread, this, *i)));
+               }
+       }
+}
+
+void
+J2KWAVEncoder::process_end ()
+{
+       boost::mutex::scoped_lock lock (_worker_mutex);
+
+       /* Keep waking workers until the queue is empty */
+       while (!_queue.empty ()) {
+               _worker_condition.notify_all ();
+               _worker_condition.wait (lock);
+       }
+
+       lock.unlock ();
+       
+       terminate_worker_threads ();
+       close_sound_files ();
+
+       /* Rename .wav.tmp files to .wav */
+       for (int i = 0; i < _fs->audio_channels; ++i) {
+               if (boost::filesystem::exists (_opt->multichannel_audio_out_path (i, false))) {
+                       boost::filesystem::remove (_opt->multichannel_audio_out_path (i, false));
+               }
+               boost::filesystem::rename (_opt->multichannel_audio_out_path (i, true), _opt->multichannel_audio_out_path (i, false));
+       }
+}
+
+void
+J2KWAVEncoder::process_audio (uint8_t* data, int data_size)
+{
+       /* Size of a sample in bytes */
+       int const sample_size = 2;
+       
+       /* XXX: we are assuming that sample_size is right, the _deinterleave_buffer_size is a multiple
+          of the sample size and that data_size is a multiple of _fs->audio_channels * sample_size.
+       */
+       
+       /* XXX: this code is very tricksy and it must be possible to make it simpler ... */
+       
+       /* Number of bytes left to read this time */
+       int remaining = data_size;
+       /* Our position in the output buffers, in bytes */
+       int position = 0;
+       while (remaining > 0) {
+               /* How many bytes of the deinterleaved data to do this time */
+               int this_time = min (remaining / _fs->audio_channels, _deinterleave_buffer_size);
+               for (int i = 0; i < _fs->audio_channels; ++i) {
+                       for (int j = 0; j < this_time; j += sample_size) {
+                               for (int k = 0; k < sample_size; ++k) {
+                                       int const to = j + k;
+                                       int const from = position + (i * sample_size) + (j * _fs->audio_channels) + k;
+                                       _deinterleave_buffer[to] = data[from];
+                               }
+                       }
+                       
+                       switch (_fs->audio_sample_format) {
+                       case AV_SAMPLE_FMT_S16:
+                               sf_write_short (_sound_files[i], (const short *) _deinterleave_buffer, this_time / sample_size);
+                               break;
+                       default:
+                               throw DecodeError ("unknown audio sample format");
+                       }
+               }
+               
+               position += this_time;
+               remaining -= this_time * _fs->audio_channels;
+       }
+}

diff --git a/src/lib/j2k_wav_encoder.h b/src/lib/j2k_wav_encoder.h
new file mode 100644 (file)
index 0000000..c8485b0
--- /dev/null
+++ b/src/lib/j2k_wav_encoder.h
@@ -0,0 +1,65 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/j2k_wav_encoder.h
+ *  @brief An encoder which writes JPEG2000 and WAV files.
+ */
+
+#include <list>
+#include <vector>
+#include <boost/thread/condition.hpp>
+#include <boost/thread/mutex.hpp>
+#include <sndfile.h>
+#include "encoder.h"
+
+class Server;
+class DCPVideoFrame;
+class Image;
+class Log;
+
+/** @class J2KWAVEncoder
+ *  @brief An encoder which writes JPEG2000 and WAV files.
+ */
+class J2KWAVEncoder : public Encoder
+{
+public:
+       J2KWAVEncoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Log *);
+       ~J2KWAVEncoder ();
+
+       void process_begin ();
+       void process_video (boost::shared_ptr<Image>, int);
+       void process_audio (uint8_t *, int);
+       void process_end ();
+
+private:       
+
+       void encoder_thread (Server *);
+       void close_sound_files ();
+       void terminate_worker_threads ();
+
+       std::vector<SNDFILE*> _sound_files;
+       int _deinterleave_buffer_size;
+       uint8_t* _deinterleave_buffer;
+
+       bool _process_end;
+       std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+       std::list<boost::thread *> _worker_threads;
+       mutable boost::mutex _worker_mutex;
+       boost::condition _worker_condition;
+};

diff --git a/src/lib/job.cc b/src/lib/job.cc
new file mode 100644 (file)
index 0000000..399b235
--- /dev/null
+++ b/src/lib/job.cc
@@ -0,0 +1,242 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/job.cc
+ *  @brief A parent class to represent long-running tasks which are run in their own thread.
+ */
+
+#include <boost/thread.hpp>
+#include "job.h"
+#include "util.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param s FilmState for the film that we are operating on.
+ *  @param o Options.
+ *  @param l A log that we can write to.
+ */
+Job::Job (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : _fs (s)
+       , _opt (o)
+       , _log (l)
+       , _state (NEW)
+       , _start_time (0)
+       , _progress_unknown (false)
+{
+       assert (_log);
+       
+       descend (1);
+}
+
+/** Start the job in a separate thread, returning immediately */
+void
+Job::start ()
+{
+       set_state (RUNNING);
+       _start_time = time (0);
+       boost::thread (boost::bind (&Job::run_wrapper, this));
+}
+
+/** A wrapper for the ::run() method to catch exceptions */
+void
+Job::run_wrapper ()
+{
+       try {
+
+               run ();
+
+       } catch (std::exception& e) {
+
+               set_progress (1);
+               set_state (FINISHED_ERROR);
+               set_error (e.what ());
+
+       }
+}
+
+/** @return true if the job is running */
+bool
+Job::running () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       return _state == RUNNING;
+}
+
+/** @return true if the job has finished (either successfully or unsuccessfully) */
+bool
+Job::finished () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       return _state == FINISHED_OK || _state == FINISHED_ERROR;
+}
+
+/** @return true if the job has finished successfully */
+bool
+Job::finished_ok () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       return _state == FINISHED_OK;
+}
+
+/** @return true if the job has finished unsuccessfully */
+bool
+Job::finished_in_error () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       return _state == FINISHED_ERROR;
+}
+
+/** Set the state of this job.
+ *  @param s New state.
+ */
+void
+Job::set_state (State s)
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       _state = s;
+}
+
+/** A hack to work around our lack of cross-thread
+ *  signalling; this emits Finished, and listeners
+ *  assume that it will be emitted in the GUI thread,
+ *  so this method must be called from the GUI thread.
+ */
+void
+Job::emit_finished ()
+{
+       Finished ();
+}
+
+/** @return Time (in seconds) that this job has been running */
+int
+Job::elapsed_time () const
+{
+       if (_start_time == 0) {
+               return 0;
+       }
+       
+       return time (0) - _start_time;
+}
+
+/** Set the progress of the current part of the job.
+ *  @param p Progress (from 0 to 1)
+ */
+void
+Job::set_progress (float p)
+{
+       boost::mutex::scoped_lock lm (_progress_mutex);
+       _stack.back().normalised = p;
+}
+
+/** @return fractional overall progress, or -1 if not known */
+float
+Job::overall_progress () const
+{
+       boost::mutex::scoped_lock lm (_progress_mutex);
+       if (_progress_unknown) {
+               return -1;
+       }
+
+       float overall = 0;
+       float factor = 1;
+       for (list<Level>::const_iterator i = _stack.begin(); i != _stack.end(); ++i) {
+               factor *= i->allocation;
+               overall += i->normalised * factor;
+       }
+
+       if (overall > 1) {
+               overall = 1;
+       }
+       
+       return overall;
+}
+
+/** Ascend up one level in terms of progress reporting; see descend() */
+void
+Job::ascend ()
+{
+       boost::mutex::scoped_lock lm (_progress_mutex);
+       
+       assert (!_stack.empty ());
+       float const a = _stack.back().allocation;
+       _stack.pop_back ();
+       _stack.back().normalised += a;
+}
+
+/** Descend down one level in terms of progress reporting; e.g. if
+ *  there is a task which is split up into N subtasks, each of which
+ *  report their progress from 0 to 100%, call descend() before executing
+ *  each subtask, and ascend() afterwards to ensure that overall progress
+ *  is reported correctly.
+ *
+ *  @param a Fraction (from 0 to 1) of the current task to allocate to the subtask.
+ */
+void
+Job::descend (float a)
+{
+       boost::mutex::scoped_lock lm (_progress_mutex);
+       _stack.push_back (Level (a));
+}
+
+/** @return Any error string that the job has generated */
+string
+Job::error () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       return _error;
+}
+
+/** Set the current error string.
+ *  @param e New error string.
+ */
+void
+Job::set_error (string e)
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       _error = e;
+}
+
+/** Set that this job's progress will always be unknown */
+void
+Job::set_progress_unknown ()
+{
+       boost::mutex::scoped_lock lm (_progress_mutex);
+       _progress_unknown = true;
+}
+
+string
+Job::status () const
+{
+       float const p = overall_progress ();
+       int const t = elapsed_time ();
+       
+       stringstream s;
+       if (!finished () && p >= 0 && t > 10) {
+               s << rint (p * 100) << "%; about " << seconds_to_approximate_hms (t / p - t) << " remaining";
+       } else if (!finished () && t <= 10) {
+               s << rint (p * 100) << "%";
+       } else if (finished_ok ()) {
+               s << "OK (ran for " << seconds_to_hms (t) << ")";
+       } else if (finished_in_error ()) {
+               s << "Error (" << error() << ")";
+       }
+
+       return s.str ();
+}

diff --git a/src/lib/job.h b/src/lib/job.h
new file mode 100644 (file)
index 0000000..2a77f78
--- /dev/null
+++ b/src/lib/job.h
@@ -0,0 +1,115 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/job.h
+ *  @brief A parent class to represent long-running tasks which are run in their own thread.
+ */
+
+#ifndef DVDOMATIC_JOB_H
+#define DVDOMATIC_JOB_H
+
+#include <string>
+#include <boost/thread/mutex.hpp>
+#include <sigc++/sigc++.h>
+
+class Log;
+class FilmState;
+class Options;
+
+/** @class Job
+ *  @brief A parent class to represent long-running tasks which are run in their own thread.
+ */
+class Job
+{
+public:
+       Job (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+
+       /** @return user-readable name of this job */
+       virtual std::string name () const = 0;
+       /** Run this job in the current thread. */
+       virtual void run () = 0;
+       
+       void start ();
+
+       bool running () const;
+       bool finished () const;
+       bool finished_ok () const;
+       bool finished_in_error () const;
+
+       std::string error () const;
+
+       int elapsed_time () const;
+       virtual std::string status () const;
+
+       void set_progress_unknown ();
+       void set_progress (float);
+       void ascend ();
+       void descend (float);
+       float overall_progress () const;
+
+       void emit_finished ();
+
+       /** Emitted from the GUI thread */
+       sigc::signal0<void> Finished;
+
+protected:
+
+       enum State {
+               NEW,           ///< the job hasn't been started yet
+               RUNNING,       ///< the job is running
+               FINISHED_OK,   ///< the job has finished successfully
+               FINISHED_ERROR ///< the job has finished in error
+       };
+       
+       void set_state (State);
+       void set_error (std::string e);
+
+       boost::shared_ptr<const FilmState> _fs;
+       boost::shared_ptr<const Options> _opt;
+
+       /** A log that this job can write to */
+       Log* _log;
+
+private:
+
+       void run_wrapper ();
+
+       /** mutex for _state and _error */
+       mutable boost::mutex _state_mutex;
+       State _state;
+       std::string _error;
+
+       time_t _start_time;
+       
+       mutable boost::mutex _progress_mutex;
+
+       struct Level {
+               Level (float a) : allocation (a), normalised (0) {}
+
+               float allocation;
+               float normalised;
+       };
+
+       std::list<Level> _stack;
+
+       /** true if this job's progress will always be unknown */
+       bool _progress_unknown;
+};
+
+#endif

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
new file mode 100644 (file)
index 0000000..dd7c62c
--- /dev/null
+++ b/src/lib/job_manager.cc
@@ -0,0 +1,101 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/job_manager.cc
+ *  @brief A simple scheduler for jobs.
+ */
+
+#include <iostream>
+#include <boost/thread.hpp>
+#include "job_manager.h"
+#include "job.h"
+
+using namespace std;
+using namespace boost;
+
+JobManager* JobManager::_instance = 0;
+
+JobManager::JobManager ()
+{
+       boost::thread (boost::bind (&JobManager::scheduler, this));
+}
+
+void
+JobManager::add (shared_ptr<Job> j)
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       
+       _jobs.push_back (j);
+}
+
+list<shared_ptr<Job> >
+JobManager::get () const
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       
+       return _jobs;
+}
+
+bool
+JobManager::work_to_do () const
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       list<shared_ptr<Job> >::const_iterator i = _jobs.begin();
+       while (i != _jobs.end() && (*i)->finished()) {
+               ++i;
+       }
+
+       return i != _jobs.end ();
+}
+
+void
+JobManager::scheduler ()
+{
+       while (1) {
+               {
+                       boost::mutex::scoped_lock lm (_mutex);
+                       int running = 0;
+                       shared_ptr<Job> first_new;
+                       for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
+                               if ((*i)->running ()) {
+                                       ++running;
+                               } else if (!(*i)->finished () && first_new == 0) {
+                                       first_new = *i;
+                               }
+
+                               if (running == 0 && first_new) {
+                                       first_new->start ();
+                                       break;
+                               }
+                       }
+               }
+
+               sleep (1);
+       }
+}
+
+JobManager *
+JobManager::instance ()
+{
+       if (_instance == 0) {
+               _instance = new JobManager ();
+       }
+
+       return _instance;
+}

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
new file mode 100644 (file)
index 0000000..f2f5e00
--- /dev/null
+++ b/src/lib/job_manager.h
@@ -0,0 +1,54 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/job_manager.h
+ *  @brief A simple scheduler for jobs.
+ */
+
+#include <list>
+#include <boost/thread/mutex.hpp>
+
+class Job;
+
+/** @class JobManager
+ *  @brief A simple scheduler for jobs.
+ *
+ *  JobManager simply keeps a list of pending jobs, and assumes that all the jobs
+ *  are sufficiently CPU intensive that there is no point running them in parallel;
+ *  so jobs are just run one after the other.
+ */
+class JobManager
+{
+public:
+
+       void add (boost::shared_ptr<Job>);
+       std::list<boost::shared_ptr<Job> > get () const;
+       bool work_to_do () const;
+
+       static JobManager* instance ();
+
+private:
+       JobManager ();
+       void scheduler ();
+       
+       mutable boost::mutex _mutex;
+       std::list<boost::shared_ptr<Job> > _jobs;
+
+       static JobManager* _instance;
+};

diff --git a/src/lib/log.cc b/src/lib/log.cc
new file mode 100644 (file)
index 0000000..accf369
--- /dev/null
+++ b/src/lib/log.cc
@@ -0,0 +1,63 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/log.cc
+ *  @brief A very simple logging class.
+ */
+
+#include <fstream>
+#include <time.h>
+#include "log.h"
+
+using namespace std;
+
+/** @param f Filename to write log to */
+Log::Log (string f)
+       : _file (f)
+       , _level (VERBOSE)
+{
+
+}
+
+/** @param n String to log */
+void
+Log::log (string m, Level l)
+{
+       boost::mutex::scoped_lock lm (_mutex);
+
+       if (l > _level) {
+               return;
+       }
+       
+       ofstream f (_file.c_str(), fstream::app);
+
+       time_t t;
+       time (&t);
+       string a = ctime (&t);
+       
+       f << a.substr (0, a.length() - 1) << ": " << m << "\n";
+}
+
+void
+Log::set_level (Level l)
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       _level = l;
+}
+

diff --git a/src/lib/log.h b/src/lib/log.h
new file mode 100644 (file)
index 0000000..d4de8eb
--- /dev/null
+++ b/src/lib/log.h
@@ -0,0 +1,55 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/log.h
+ *  @brief A very simple logging class.
+ */
+
+#include <string>
+#include <boost/thread/mutex.hpp>
+
+/** @class Log
+ *  @brief A very simple logging class.
+ *
+ *  This class simply accepts log messages and writes them to a file.
+ *  Its single nod to complexity is that it has a mutex to prevent
+ *  multi-thread logging from clashing.
+ */
+class Log
+{
+public:
+       Log (std::string f);
+
+       enum Level {
+               STANDARD = 0,
+               VERBOSE = 1
+       };
+
+       void log (std::string m, Level l = STANDARD);
+
+       void set_level (Level l);
+
+private:
+       /** mutex to prevent simultaneous writes to the file */
+       boost::mutex _mutex;
+       /** filename to write to */
+       std::string _file;
+       /** level above which to ignore log messages */
+       Level _level;
+};

diff --git a/src/lib/lut.h b/src/lib/lut.h
new file mode 100644 (file)
index 0000000..26888a2
--- /dev/null
+++ b/src/lib/lut.h
@@ -0,0 +1,51 @@
+/*
+    Taken from OpenDCP: Builds Digital Cinema Packages
+    Copyright (c) 2010-2011 Terrence Meiczinger, All Rights Reserved
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/** @file src/lut.h
+ *  @brief Look-up tables for colour conversions (from OpenDCP)
+ */
+
+#define BIT_DEPTH      12 
+#define BIT_PRECISION  16 
+#define COLOR_DEPTH    (4095)
+#define DCI_LUT_SIZE   ((COLOR_DEPTH + 1) * BIT_PRECISION)
+#define DCI_GAMMA      (2.6)
+#define DCI_DEGAMMA    (1/DCI_GAMMA)
+#define DCI_COEFFICENT (48.0/52.37)
+
+enum COLOR_PROFILE_ENUM {
+    CP_SRGB = 0,
+    CP_REC709,
+    CP_DC28,
+    CP_MAX
+};
+
+enum LUT_IN_ENUM {
+    LI_SRGB    = 0,
+    LI_REC709,
+    LI_MAX
+};
+
+enum LUT_OUT_ENUM {
+    LO_DCI    = 0,
+    LO_MAX
+};
+
+extern float color_matrix[3][3][3];
+extern float lut_in[LI_MAX][4095+1];
+extern int lut_out[1][DCI_LUT_SIZE];

diff --git a/src/lib/make_dcp_job.cc b/src/lib/make_dcp_job.cc
new file mode 100644 (file)
index 0000000..81deb83
--- /dev/null
+++ b/src/lib/make_dcp_job.cc
@@ -0,0 +1,94 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/make_dcp_job.cc
+ *  @brief A job to create DCPs.
+ */
+
+#include <boost/filesystem.hpp>
+extern "C" {
+#include <libavutil/pixdesc.h>
+}
+#include "make_dcp_job.h"
+#include "film_state.h"
+#include "dcp_content_type.h"
+#include "exceptions.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param s FilmState of the Film we are making the DCP for.
+ *  @param o Options.
+ *  @param l Log.
+ */
+MakeDCPJob::MakeDCPJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : ShellCommandJob (s, o, l)
+{
+       
+}
+
+string
+MakeDCPJob::name () const
+{
+       stringstream s;
+       s << "Make DCP for " << _fs->name;
+       return s.str ();
+}
+
+void
+MakeDCPJob::run ()
+{
+       set_progress_unknown ();
+
+       string const dcp_path = _fs->dir (_fs->name);
+       
+       /* Check that we have our prerequisites */
+
+       if (!filesystem::exists (filesystem::path (_fs->file ("video.mxf")))) {
+               throw EncodeError ("missing video.mxf");
+       }
+
+       bool const have_audio = filesystem::exists (filesystem::path (_fs->file ("audio.mxf")));
+
+       /* Remove any old DCP */
+       filesystem::remove_all (dcp_path);
+
+       /* Re-make the DCP directory */
+       _fs->dir (_fs->name);
+       
+       stringstream c;
+       c << "cd \"" << dcp_path << "\" && "
+         << " opendcp_xml -d -a " << _fs->name
+         << " -t \"" << _fs->name << "\""
+         << " -k " << _fs->dcp_content_type->opendcp_name()
+         << " --reel \"" << _fs->file ("video.mxf") << "\"";
+       
+       if (have_audio) {
+               c << " \"" << _fs->file ("audio.mxf") << "\"";
+       }
+
+       command (c.str ());
+
+       filesystem::rename (filesystem::path (_fs->file ("video.mxf")), filesystem::path (dcp_path + "/video.mxf"));
+       if (have_audio) {
+               filesystem::rename (filesystem::path (_fs->file ("audio.mxf")), filesystem::path (dcp_path + "/audio.mxf"));
+       }
+
+       set_progress (1);
+}

diff --git a/src/lib/make_dcp_job.h b/src/lib/make_dcp_job.h
new file mode 100644 (file)
index 0000000..4e31935
--- /dev/null
+++ b/src/lib/make_dcp_job.h
@@ -0,0 +1,37 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/make_dcp_job.h
+ *  @brief A job to create DCPs.
+ */
+
+#include "shell_command_job.h"
+
+/** @class MakeDCPJob
+ *  @brief A job to create DCPs
+ */
+class MakeDCPJob : public ShellCommandJob
+{
+public:
+       MakeDCPJob (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Log *);
+
+       std::string name () const;
+       void run ();
+};
+

diff --git a/src/lib/make_mxf_job.cc b/src/lib/make_mxf_job.cc
new file mode 100644 (file)
index 0000000..6b0c1a4
--- /dev/null
+++ b/src/lib/make_mxf_job.cc
@@ -0,0 +1,81 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/make_mxf_job.cc
+ *  @brief A job that creates a MXF file from some data.
+ */
+
+#include <iostream>
+#include "make_mxf_job.h"
+#include "film.h"
+#include "film_state.h"
+#include "options.h"
+
+using namespace std;
+using namespace boost;
+
+/** @class MakeMXFJob
+ *  @brief A job that creates a MXF file from some data.
+ */
+
+MakeMXFJob::MakeMXFJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l, Type t)
+       : ShellCommandJob (s, o, l)
+       , _type (t)
+{
+
+}
+
+string
+MakeMXFJob::name () const
+{
+       stringstream s;
+       switch (_type) {
+       case VIDEO:
+               s << "Make video MXF for " << _fs->name;
+               break;
+       case AUDIO:
+               s << "Make audio MXF for " << _fs->name;
+               break;
+       }
+       
+       return s.str ();
+}
+
+void
+MakeMXFJob::run ()
+{
+       set_progress_unknown ();
+
+       /* We round for DCP: not sure if this is right */
+       float fps = rintf (_fs->frames_per_second);
+       
+       stringstream c;
+       c << "opendcp_mxf -r " << fps << " -i ";
+       switch (_type) {
+       case VIDEO:
+               c << "\"" << _opt->frame_out_path () << "\" -o \"" << _fs->file ("video.mxf") << "\"";
+               break;
+       case AUDIO:
+               c << "\"" << _opt->multichannel_audio_out_path () << "\" -o \"" << _fs->file ("audio.mxf") << "\"";
+               break;
+       }
+
+       command (c.str ());
+       set_progress (1);
+}

diff --git a/src/lib/make_mxf_job.h b/src/lib/make_mxf_job.h
new file mode 100644 (file)
index 0000000..462381d
--- /dev/null
+++ b/src/lib/make_mxf_job.h
@@ -0,0 +1,48 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/make_mxf_job.h
+ *  @brief A job that creates a MXF file from some data.
+ */
+
+#include "shell_command_job.h"
+
+class FilmState;
+class Options;
+
+/** @class MakeMXFJob
+ *  @brief A job that creates a MXF file from some data.
+ */
+class MakeMXFJob : public ShellCommandJob
+{
+public:
+       enum Type {
+               AUDIO,
+               VIDEO
+       };
+       
+       MakeMXFJob (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Log *, Type);
+
+       std::string name () const;
+       void run ();
+
+private:
+       Type _type;
+};
+

diff --git a/src/lib/options.h b/src/lib/options.h
new file mode 100644 (file)
index 0000000..b283e33
--- /dev/null
+++ b/src/lib/options.h
@@ -0,0 +1,109 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/options.h
+ *  @brief Options for a transcoding operation.
+ */
+
+#include <string>
+#include <iomanip>
+#include <sstream>
+#include "util.h"
+
+/** @class Options
+ *  @brief Options for a transcoding operation.
+ *
+ *  These are settings which may be different, in different circumstances, for
+ *  the same film; ie they are options for a particular transcode operation.
+ */
+class Options
+{
+public:
+
+       Options (std::string f, std::string e, std::string m)
+               : padding (0)
+               , apply_crop (true)
+               , num_frames (0)
+               , decode_video (true)
+               , decode_video_frequency (0)
+               , decode_audio (true)
+               , _frame_out_path (f)
+               , _frame_out_extension (e)
+               , _multichannel_audio_out_path (m)
+       {}
+
+       /** @return The path to write video frames to */
+       std::string frame_out_path () const {
+               return _frame_out_path;
+       }
+
+       /** @param f Frame index.
+        *  @param t true to return a temporary file path, otherwise a permanent one.
+        *  @return The path to write this video frame to.
+        */
+       std::string frame_out_path (int f, bool t) const {
+               std::stringstream s;
+               s << _frame_out_path << "/";
+               s.width (8);
+               s << std::setfill('0') << f << _frame_out_extension;
+
+               if (t) {
+                       s << ".tmp";
+               }
+
+               return s.str ();
+       }
+
+       /** @return Path to write multichannel audio data to */
+       std::string multichannel_audio_out_path () const {
+               return _multichannel_audio_out_path;
+       }
+
+       /** @param c Audio channel index.
+        *  @param t true to return a temporary file path, otherwise a permanent one.
+        *  @return The path to write this audio file to.
+        */
+       std::string multichannel_audio_out_path (int c, bool t) const {
+               std::stringstream s;
+               s << _multichannel_audio_out_path << "/" << (c + 1) << ".wav";
+               if (t) {
+                       s << ".tmp";
+               }
+
+               return s.str ();
+       }
+
+       Size out_size;              ///< size of output images
+       float ratio;                ///< ratio of the wanted output image (not considering padding)
+       int padding;                ///< number of pixels of padding (in terms of the output size) each side of the image
+       bool apply_crop;            ///< true to apply cropping
+       int num_frames;             ///< number of video frames to run for, or 0 for all
+       int black_after;            ///< first frame for which to output a black frame, rather than the actual video content, or 0 for none
+       bool decode_video;          ///< true to decode video, otherwise false
+       int decode_video_frequency; ///< skip frames so that this many are decoded in all (or 0) (for generating thumbnails)
+       bool decode_audio;          ///< true to decode audio, otherwise false
+
+private:
+       /** Path of the directory to write video frames to */
+       std::string _frame_out_path;
+       /** Extension to use for video frame files (including the leading .) */
+       std::string _frame_out_extension;
+       /** Path of the directory to write audio files to */
+       std::string _multichannel_audio_out_path;
+};

diff --git a/src/lib/player.cc b/src/lib/player.cc
new file mode 100644 (file)
index 0000000..db69c66
--- /dev/null
+++ b/src/lib/player.cc
@@ -0,0 +1,227 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <sstream>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <boost/thread.hpp>
+#include <boost/algorithm/string.hpp>
+#include "player.h"
+#include "film_state.h"
+#include "filter.h"
+#include "screen.h"
+#include "exceptions.h"
+
+using namespace std;
+using namespace boost;
+
+Player::Player (shared_ptr<const FilmState> fs, shared_ptr<const Screen> screen, Split split)
+       : _stdout_reader_should_run (true)
+       , _position (0)
+       , _paused (false)
+{
+       assert (fs->format);
+       
+       if (pipe (_mplayer_stdin) < 0) {
+               throw PlayError ("could not create pipe");
+       }
+
+       if (pipe (_mplayer_stdout) < 0) {
+               throw PlayError ("could not create pipe");
+       }
+
+       if (pipe (_mplayer_stderr) < 0) {
+               throw PlayError ("could not create pipe");
+       }
+       
+       int const p = fork ();
+       if (p < 0) {
+               throw PlayError ("could not fork for mplayer");
+       } else if (p == 0) {
+               close (_mplayer_stdin[1]);
+               dup2 (_mplayer_stdin[0], STDIN_FILENO);
+               
+               close (_mplayer_stdout[0]);
+               dup2 (_mplayer_stdout[1], STDOUT_FILENO);
+               
+               close (_mplayer_stderr[0]);
+               dup2 (_mplayer_stderr[1], STDERR_FILENO);
+
+               char* p[] = { strdup ("TERM=xterm"), strdup ("DISPLAY=:0"), 0 };
+               environ = p;
+
+               stringstream s;
+               s << "/usr/local/bin/mplayer";
+
+               s << " -vo x11 -noaspect -noautosub -nosub -vo x11 -noborder -slave -quiet -input nodefault-bindings:conf=/dev/null";
+               s << " -sws " << fs->scaler->mplayer_id ();
+
+               stringstream vf;
+               
+               Position position = screen->position (fs->format);
+               Size screen_size = screen->size (fs->format);
+               Size const cropped_size = fs->cropped_size (fs->size);
+               switch (split) {
+               case SPLIT_NONE:
+                       vf << crop_string (Position (fs->left_crop, fs->top_crop), cropped_size);
+                       s << " -geometry " << position.x << ":" << position.y;
+                       break;
+               case SPLIT_LEFT:
+               {
+                       Size split_size = cropped_size;
+                       split_size.width /= 2;
+                       vf << crop_string (Position (fs->left_crop, fs->top_crop), split_size);
+                       screen_size.width /= 2;
+                       s << " -geometry " << position.x << ":" << position.y;
+                       break;
+               }
+               case SPLIT_RIGHT:
+               {
+                       Size split_size = cropped_size;
+                       split_size.width /= 2;
+                       vf << crop_string (Position (fs->left_crop + split_size.width, fs->top_crop), split_size);
+                       screen_size.width /= 2;
+                       s << " -geometry " << (position.x + screen_size.width) << ":" << position.y;
+                       break;
+               }
+               }
+
+               vf << ",scale=" << screen_size.width << ":" << screen_size.height;
+               
+               pair<string, string> filters = Filter::ffmpeg_strings (fs->filters);
+               
+               if (!filters.first.empty()) {
+                       vf << "," << filters.first;
+               }
+               
+               if (!filters.second.empty ()) {
+                       vf << ",pp=" << filters.second;
+               }
+               
+               s << " -vf " << vf.str();
+               s << " \"" << fs->content_path() << "\" ";
+
+               string cmd (s.str ());
+
+               vector<string> b = split_at_spaces_considering_quotes (cmd);
+               
+               char** cl = new char*[b.size() + 1];
+               for (vector<string>::size_type i = 0; i < b.size(); ++i) {
+                       cl[i] = strdup (b[i].c_str ());
+               }
+               cl[b.size()] = 0;
+               
+               execv (cl[0], cl);
+
+               stringstream e;
+               e << "exec of mplayer failed " << strerror (errno);
+               throw PlayError (e.str ());
+               
+       } else {
+               _mplayer_pid = p;
+               command ("pause");
+
+               _stdout_reader = new boost::thread (boost::bind (&Player::stdout_reader, this));
+       }
+}
+
+Player::~Player ()
+{
+       _stdout_reader_should_run = false;
+       _stdout_reader->join ();
+       delete _stdout_reader;
+       
+       close (_mplayer_stdin[0]);
+       close (_mplayer_stdout[1]);
+       kill (_mplayer_pid, SIGTERM);
+}
+
+void
+Player::command (string c)
+{
+       char buf[64];
+       snprintf (buf, sizeof (buf), "%s\n", c.c_str ());
+       write (_mplayer_stdin[1], buf, strlen (buf));
+}
+
+void
+Player::stdout_reader ()
+{
+       while (_stdout_reader_should_run) {
+               char buf[1024];
+               int r = read (_mplayer_stdout[0], buf, sizeof (buf));
+               if (r > 0) {
+                       stringstream s (buf);
+                       while (s.good ()) {
+                               string line;
+                               getline (s, line);
+
+                               vector<string> b;
+                               split (b, line, is_any_of ("="));
+                               if (b.size() < 2) {
+                                       continue;
+                               }
+
+                               if (b[0] == "ANS_time_pos") {
+                                       set_position (atof (b[1].c_str ()));
+                               } else if (b[0] == "ANS_pause") {
+                                       set_paused (b[1] == "yes");
+                               }
+                       }
+               }
+
+               usleep (5e5);
+
+               snprintf (buf, sizeof (buf), "pausing_keep_force get_property time_pos\npausing_keep_force get_property pause\n");
+               write (_mplayer_stdin[1], buf, strlen (buf));
+       }
+}
+
+void
+Player::set_position (float p)
+{
+       /* XXX: could be an atomic */
+       boost::mutex::scoped_lock lm (_state_mutex);
+       _position = p;
+}
+
+void
+Player::set_paused (bool p)
+{
+       /* XXX: could be an atomic */
+       boost::mutex::scoped_lock lm (_state_mutex);
+       _paused = p;
+}
+
+float
+Player::position () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       return _position;
+}
+
+bool
+Player::paused () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+       return _paused;
+}

diff --git a/src/lib/player.h b/src/lib/player.h
new file mode 100644 (file)
index 0000000..fc08deb
--- /dev/null
+++ b/src/lib/player.h
@@ -0,0 +1,70 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef DVDOMATIC_PLAYER_H
+#define DVDOMATIC_PLAYER_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/mutex.hpp>
+
+class FilmState;
+class Screen;
+
+class Player
+{
+public:
+       enum Split {
+               SPLIT_NONE,
+               SPLIT_LEFT,
+               SPLIT_RIGHT
+       };
+               
+       Player (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Screen>, Split);
+       ~Player ();
+
+       void command (std::string);
+
+       float position () const;
+       bool paused () const;
+       
+       pid_t mplayer_pid () const {
+               return _mplayer_pid;
+       }
+
+private:
+       void stdout_reader ();
+       void set_position (float);
+       void set_paused (bool);
+       
+       int _mplayer_stdin[2];
+       int _mplayer_stdout[2];
+       int _mplayer_stderr[2];
+       pid_t _mplayer_pid;
+
+       boost::thread* _stdout_reader;
+       /* XXX: should probably be atomically accessed */
+       bool _stdout_reader_should_run;
+
+       mutable boost::mutex _state_mutex;
+       float _position;
+       bool _paused;
+};
+
+#endif

diff --git a/src/lib/player_manager.cc b/src/lib/player_manager.cc
new file mode 100644 (file)
index 0000000..74fd238
--- /dev/null
+++ b/src/lib/player_manager.cc
@@ -0,0 +1,137 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "player_manager.h"
+#include "player.h"
+#include "film_state.h"
+#include "screen.h"
+
+using namespace std;
+using namespace boost;
+
+PlayerManager* PlayerManager::_instance = 0;
+
+PlayerManager::PlayerManager ()
+{
+
+}
+
+PlayerManager *
+PlayerManager::instance ()
+{
+       if (_instance == 0) {
+               _instance = new PlayerManager ();
+       }
+
+       return _instance;
+}
+
+void
+PlayerManager::setup (shared_ptr<const FilmState> fs, shared_ptr<const Screen> sc)
+{
+       boost::mutex::scoped_lock lm (_players_mutex);
+       
+       _players.clear ();
+       _players.push_back (shared_ptr<Player> (new Player (fs, sc, Player::SPLIT_NONE)));
+}
+
+void
+PlayerManager::setup (shared_ptr<const FilmState> fs_a, shared_ptr<const FilmState> fs_b, shared_ptr<const Screen> sc)
+{
+       boost::mutex::scoped_lock lm (_players_mutex);
+       
+       _players.clear ();
+
+       _players.push_back (shared_ptr<Player> (new Player (fs_a, sc, Player::SPLIT_LEFT)));
+       _players.push_back (shared_ptr<Player> (new Player (fs_b, sc, Player::SPLIT_RIGHT)));
+}
+
+void
+PlayerManager::pause_or_unpause ()
+{
+       boost::mutex::scoped_lock lm (_players_mutex);
+       
+       for (list<shared_ptr<Player> >::iterator i = _players.begin(); i != _players.end(); ++i) {
+               (*i)->command ("pause");
+       }
+}
+
+void
+PlayerManager::set_position (float p)
+{
+       boost::mutex::scoped_lock lm (_players_mutex);
+       
+       stringstream s;
+       s << "pausing_keep_force seek " << p << " 2";
+       for (list<shared_ptr<Player> >::iterator i = _players.begin(); i != _players.end(); ++i) {
+               (*i)->command (s.str ());
+       }
+}
+
+float
+PlayerManager::position () const
+{
+       boost::mutex::scoped_lock lm (_players_mutex);
+       
+       if (_players.empty ()) {
+               return 0;
+       }
+
+       return _players.front()->position ();
+}
+
+void
+PlayerManager::child_exited (pid_t pid)
+{
+       boost::mutex::scoped_lock lm (_players_mutex);
+       
+       list<shared_ptr<Player> >::iterator i = _players.begin();
+       while (i != _players.end() && (*i)->mplayer_pid() != pid) {
+               ++i;
+       }
+       
+       if (i == _players.end()) {
+               return;
+       }
+
+       _players.erase (i);
+}
+
+PlayerManager::State
+PlayerManager::state () const
+{
+       boost::mutex::scoped_lock lm (_players_mutex);
+
+       if (_players.empty ()) {
+               return QUIESCENT;
+       }
+
+       if (_players.front()->paused ()) {
+               return PAUSED;
+       }
+
+       return PLAYING;
+}
+
+void
+PlayerManager::stop ()
+{
+       boost::mutex::scoped_lock lm (_players_mutex);
+       _players.clear ();
+}

diff --git a/src/lib/player_manager.h b/src/lib/player_manager.h
new file mode 100644 (file)
index 0000000..70a31b2
--- /dev/null
+++ b/src/lib/player_manager.h
@@ -0,0 +1,59 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <list>
+#include <boost/shared_ptr.hpp>
+#include "player.h"
+
+class Player;
+class FilmState;
+class Screen;
+
+class PlayerManager
+{
+public:
+
+       void setup (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Screen>);
+       void setup (boost::shared_ptr<const FilmState>, boost::shared_ptr<const FilmState>, boost::shared_ptr<const Screen>);
+       void pause_or_unpause ();
+       void stop ();
+
+       float position () const;
+       void set_position (float);
+
+       enum State {
+               QUIESCENT,
+               PLAYING,
+               PAUSED
+       };
+
+       State state () const;
+
+       void child_exited (pid_t);
+
+       static PlayerManager* instance ();
+
+private:
+       PlayerManager ();
+
+       mutable boost::mutex _players_mutex;
+       std::list<boost::shared_ptr<Player> > _players;
+       
+       static PlayerManager* _instance;
+};

diff --git a/src/lib/scaler.cc b/src/lib/scaler.cc
new file mode 100644 (file)
index 0000000..1e63d66
--- /dev/null
+++ b/src/lib/scaler.cc
@@ -0,0 +1,117 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/scaler.cc
+ *  @brief A class to describe one of FFmpeg's software scalers.
+ */
+
+#include <iostream>
+#include <cassert>
+extern "C" {
+#include <libswscale/swscale.h>
+}
+#include "scaler.h"
+
+using namespace std;
+
+vector<Scaler const *> Scaler::_scalers;
+
+/** @param f FFmpeg id.
+ *  @param m mplayer command line id.
+ *  @param i Our id.
+ *  @param n User-visible name.
+ */
+Scaler::Scaler (int f, int m, string i, string n)
+       : _ffmpeg_id (f)
+       , _mplayer_id (m)
+       , _id (i)
+       , _name (n)
+{
+
+}
+
+/** @return All available scalers */
+vector<Scaler const *>
+Scaler::all ()
+{
+       return _scalers;
+}
+
+/** Set up the static _scalers vector; must be called before from_*
+ *  methods are used.
+ */
+void
+Scaler::setup_scalers ()
+{
+       _scalers.push_back (new Scaler (SWS_BICUBIC, 2, "bicubic", "Bicubic"));
+       _scalers.push_back (new Scaler (SWS_X, 3, "x", "X"));
+       _scalers.push_back (new Scaler (SWS_AREA, 5, "area", "Area"));
+       _scalers.push_back (new Scaler (SWS_GAUSS, 7, "gauss", "Gaussian"));
+       _scalers.push_back (new Scaler (SWS_LANCZOS, 9, "lanczos", "Lanczos"));
+       _scalers.push_back (new Scaler (SWS_SINC, 8, "sinc", "Sinc"));
+       _scalers.push_back (new Scaler (SWS_SPLINE, 10, "spline", "Spline"));
+       _scalers.push_back (new Scaler (SWS_BILINEAR, 1, "bilinear", "Bilinear"));
+       _scalers.push_back (new Scaler (SWS_FAST_BILINEAR, 0, "fastbilinear", "Fast Bilinear"));
+}
+
+/** @param id One of our ids.
+ *  @return Corresponding scaler, or 0.
+ */
+Scaler const *
+Scaler::from_id (string id)
+{
+       vector<Scaler const *>::iterator i = _scalers.begin ();
+       while (i != _scalers.end() && (*i)->id() != id) {
+               ++i;
+       }
+
+       if (i == _scalers.end ()) {
+               return 0;
+       }
+
+       return *i;
+}
+
+/** @param s A scaler from our static list.
+ *  @return Index of the scaler with the list, or -1.
+ */
+int
+Scaler::as_index (Scaler const * s)
+{
+       vector<Scaler*>::size_type i = 0;
+       while (i < _scalers.size() && _scalers[i] != s) {
+               ++i;
+       }
+
+       if (i == _scalers.size ()) {
+               return -1;
+       }
+
+       return i;
+}
+
+/** @param i An index returned from as_index().
+ *  @return Corresponding scaler.
+ */
+Scaler const *
+Scaler::from_index (int i)
+{
+       assert (i <= int(_scalers.size ()));
+       return _scalers[i];
+}

diff --git a/src/lib/scaler.h b/src/lib/scaler.h
new file mode 100644 (file)
index 0000000..8ededfe
--- /dev/null
+++ b/src/lib/scaler.h
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/scaler.h
+ *  @brief A class to describe one of FFmpeg's software scalers.
+ */
+
+#ifndef DVDOMATIC_SCALER_H
+#define DVDOMATIC_SCALER_H
+
+#include <string>
+#include <vector>
+
+/** @class Scaler
+ *  @brief Class to describe one of FFmpeg's software scalers
+ */
+class Scaler
+{
+public:
+       Scaler (int f, int m, std::string i, std::string n);
+
+       /** @return id used for calls to FFmpeg's pp_postprocess */
+       int ffmpeg_id () const {
+               return _ffmpeg_id;
+       }
+
+       /** @return number to use on an mplayer command line */
+       int mplayer_id () const {
+               return _mplayer_id;
+       }
+
+       /** @return id for our use */
+       std::string id () const {
+               return _id;
+       }
+
+       /** @return user-visible name for this scaler */
+       std::string name () const {
+               return _name;
+       }
+       
+       static std::vector<Scaler const *> all ();
+       static void setup_scalers ();
+       static Scaler const * from_id (std::string id);
+       static Scaler const * from_index (int);
+       static int as_index (Scaler const *);
+
+private:
+
+       /** id used for calls to FFmpeg's pp_postprocess */
+       int _ffmpeg_id;
+       int _mplayer_id;
+       /** id for our use */
+       std::string _id;
+       /** user-visible name for this scaler */
+       std::string _name;
+
+       /** sll available scalers */
+       static std::vector<Scaler const *> _scalers;
+};
+
+#endif

diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
new file mode 100644 (file)
index 0000000..94e4038
--- /dev/null
+++ b/src/lib/scp_dcp_job.cc
@@ -0,0 +1,242 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/scp_dcp_job.cc
+ *  @brief A job to copy DCPs to a SCP-enabled server.
+ */
+
+#include <iostream>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <boost/filesystem.hpp>
+#include <libssh/libssh.h>
+#include "scp_dcp_job.h"
+#include "exceptions.h"
+#include "config.h"
+#include "log.h"
+#include "film_state.h"
+
+using namespace std;
+using namespace boost;
+
+class SSHSession
+{
+public:
+       SSHSession ()
+               : _connected (false)
+       {
+               session = ssh_new ();
+               if (session == 0) {
+                       throw NetworkError ("Could not start SSH session");
+               }
+       }
+
+       int connect ()
+       {
+               int r = ssh_connect (session);
+               if (r == 0) {
+                       _connected = true;
+               }
+               return r;
+       }
+
+       ~SSHSession ()
+       {
+               if (_connected) {
+                       ssh_disconnect (session);
+               }
+               ssh_free (session);
+       }
+
+       ssh_session session;
+
+private:       
+       bool _connected;
+};
+
+class SSHSCP
+{
+public:
+       SSHSCP (ssh_session s)
+       {
+               scp = ssh_scp_new (s, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str ());
+               if (!scp) {
+                       stringstream s;
+                       s << "Could not start SCP session (" << ssh_get_error (s) << ")";
+                       throw NetworkError (s.str ());
+               }
+       }
+
+       ~SSHSCP ()
+       {
+               ssh_scp_free (scp);
+       }
+
+       ssh_scp scp;
+};
+
+
+SCPDCPJob::SCPDCPJob (shared_ptr<const FilmState> s, Log* l)
+       : Job (s, shared_ptr<const Options> (), l)
+       , _status ("Waiting")
+{
+
+}
+
+string
+SCPDCPJob::name () const
+{
+       stringstream s;
+       s << "Copy DCP to TMS";
+       return s.str ();
+}
+
+void
+SCPDCPJob::run ()
+{
+       try {
+               _log->log ("SCP DCP job starting");
+
+               SSHSession ss;
+
+               set_status ("Connecting");
+
+               ssh_options_set (ss.session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str ());
+               ssh_options_set (ss.session, SSH_OPTIONS_USER, Config::instance()->tms_user().c_str ());
+               int const port = 22;
+               ssh_options_set (ss.session, SSH_OPTIONS_PORT, &port);
+               
+               int r = ss.connect ();
+               if (r != SSH_OK) {
+                       stringstream s;
+                       s << "Could not connect to server " << Config::instance()->tms_ip() << " (" << ssh_get_error (ss.session) << ")";
+                       throw NetworkError (s.str ());
+               }
+
+               int const state = ssh_is_server_known (ss.session);
+               if (state == SSH_SERVER_ERROR) {
+                       stringstream s;
+                       s << "SSH error (" << ssh_get_error (ss.session) << ")";
+                       throw NetworkError (s.str ());
+               }
+
+               r = ssh_userauth_password (ss.session, 0, Config::instance()->tms_password().c_str ());
+               if (r != SSH_AUTH_SUCCESS) {
+                       stringstream s;
+                       s << "Failed to authenticate with server (" << ssh_get_error (ss.session) << ")";
+                       throw NetworkError (s.str ());
+               }
+               
+               SSHSCP sc (ss.session);
+
+               r = ssh_scp_init (sc.scp);
+               if (r != SSH_OK) {
+                       stringstream s;
+                       s << "Could not start SCP session (" << ssh_get_error (ss.session) << ")";
+                       throw NetworkError (s.str ());
+               }
+
+               r = ssh_scp_push_directory (sc.scp, _fs->name.c_str(), S_IRWXU);
+               if (r != SSH_OK) {
+                       stringstream s;
+                       s << "Could not create remote directory " << _fs->name << "(" << ssh_get_error (ss.session) << ")";
+                       throw NetworkError (s.str ());
+               }
+
+               string const dcp_dir = _fs->dir (_fs->name);
+
+               int bytes_to_transfer = 0;
+               for (filesystem::directory_iterator i = filesystem::directory_iterator (dcp_dir); i != filesystem::directory_iterator(); ++i) {
+                       bytes_to_transfer += filesystem::file_size (*i);
+               }
+               
+               int buffer_size = 64 * 1024;
+               char buffer[buffer_size];
+               int bytes_transferred = 0;
+               
+               for (filesystem::directory_iterator i = filesystem::directory_iterator (dcp_dir); i != filesystem::directory_iterator(); ++i) {
+
+                       /* Aah, the sweet smell of progress */
+#if BOOST_FILESYSTEM_VERSION == 3              
+                       string const leaf = filesystem::path(*i).leaf().generic_string ();
+#else
+                       string const leaf = i->leaf ();
+#endif
+
+                       set_status ("Copying " + leaf);
+
+                       int to_do = filesystem::file_size (*i);
+                       ssh_scp_push_file (sc.scp, leaf.c_str(), to_do, S_IRUSR | S_IWUSR);
+
+                       int fd = open (filesystem::path (*i).string().c_str(), O_RDONLY);
+                       if (fd == 0) {
+                               stringstream s;
+                               s << "Could not open " << *i << " to send";
+                               throw NetworkError (s.str ());
+                       }
+
+                       while (to_do > 0) {
+                               int const t = min (to_do, buffer_size);
+                               read (fd, buffer, t);
+                               r = ssh_scp_write (sc.scp, buffer, t);
+                               if (r != SSH_OK) {
+                                       stringstream s;
+                                       s << "Could not write to remote file (" << ssh_get_error (ss.session) << ")";
+                                       throw NetworkError (s.str ());
+                               }
+                               to_do -= t;
+                               bytes_transferred += t;
+
+                               set_progress ((double) bytes_transferred / bytes_to_transfer);
+                       }
+               }
+
+               set_progress (1);
+               set_status ("OK");
+               set_state (FINISHED_OK);
+
+       } catch (std::exception& e) {
+
+               stringstream s;
+               set_progress (1);
+               set_state (FINISHED_ERROR);
+               set_status (e.what ());
+
+               s << "SCP DCP job failed (" << e.what() << ")";
+               _log->log (s.str ());
+
+               throw;
+       }
+}
+
+string
+SCPDCPJob::status () const
+{
+       boost::mutex::scoped_lock lm (_status_mutex);
+       return _status;
+}
+
+void
+SCPDCPJob::set_status (string s)
+{
+       boost::mutex::scoped_lock lm (_status_mutex);
+       _status = s;
+}
+       

diff --git a/src/lib/scp_dcp_job.h b/src/lib/scp_dcp_job.h
new file mode 100644 (file)
index 0000000..1c795be
--- /dev/null
+++ b/src/lib/scp_dcp_job.h
@@ -0,0 +1,40 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/scp_dcp_job.h
+ *  @brief A job to copy DCPs to a SCP-enabled server.
+ */
+
+#include "job.h"
+
+class SCPDCPJob : public Job
+{
+public:
+       SCPDCPJob (boost::shared_ptr<const FilmState>, Log *);
+
+       std::string name () const;
+       void run ();
+       std::string status () const;
+
+private:
+       void set_status (std::string);
+       
+       mutable boost::mutex _status_mutex;
+       std::string _status;
+};

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
new file mode 100644 (file)
index 0000000..25e44f7
--- /dev/null
+++ b/src/lib/screen.cc
@@ -0,0 +1,104 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/algorithm/string.hpp>
+#include "screen.h"
+#include "format.h"
+#include "exceptions.h"
+
+using namespace std;
+using namespace boost;
+
+Screen::Screen (string n)
+       : _name (n)
+{
+       vector<Format const *> f = Format::all ();
+       for (vector<Format const *>::iterator i = f.begin(); i != f.end(); ++i) {
+               set_geometry (*i, Position (0, 0), Size (2048, 1080));
+       }
+}
+
+void
+Screen::set_geometry (Format const * f, Position p, Size s)
+{
+       _geometries[f] = Geometry (p, s);
+}
+
+Position
+Screen::position (Format const * f) const
+{
+       GeometryMap::const_iterator i = _geometries.find (f);
+       if (i == _geometries.end ()) {
+               throw PlayError ("format not found for screen");
+       }
+
+       return i->second.position;
+}
+
+Size
+Screen::size (Format const * f) const
+{
+       GeometryMap::const_iterator i = _geometries.find (f);
+       if (i == _geometries.end ()) {
+               throw PlayError ("format not found for screen");
+       }
+
+       return i->second.size;
+}
+
+string
+Screen::as_metadata () const
+{
+       stringstream s;
+       s << "\"" << _name << "\"";
+
+       for (GeometryMap::const_iterator i = _geometries.begin(); i != _geometries.end(); ++i) {
+               s << " " << i->first->as_metadata()
+                 << " " << i->second.position.x << " " << i->second.position.y
+                 << " " << i->second.size.width << " " << i->second.size.height;
+       }
+
+       return s.str ();
+}
+
+shared_ptr<Screen>
+Screen::create_from_metadata (string v)
+{
+       vector<string> b = split_at_spaces_considering_quotes (v);
+
+       if (b.size() < 1) {
+               return shared_ptr<Screen> ();
+       }
+
+       shared_ptr<Screen> s (new Screen (b[0]));
+
+       vector<string>::size_type i = 1;
+       while (b.size() > i) {
+               if (b.size() >= (i + 5)) {
+                       s->set_geometry (
+                               Format::from_metadata (b[i].c_str()),
+                               Position (atoi (b[i+1].c_str()), atoi (b[i+2].c_str())),
+                               Size (atoi (b[i+3].c_str()), atoi (b[i+4].c_str()))
+                               );
+               }
+               i += 5;
+       }
+
+       return s;
+}

diff --git a/src/lib/screen.h b/src/lib/screen.h
new file mode 100644 (file)
index 0000000..663b3c3
--- /dev/null
+++ b/src/lib/screen.h
@@ -0,0 +1,68 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <string>
+#include <vector>
+#include <map>
+#include "util.h"
+
+class Format;
+
+class Screen
+{
+public:
+       Screen (std::string);
+
+       void set_geometry (Format const *, Position, Size);
+
+       std::string name () const {
+               return _name;
+       }
+
+       void set_name (std::string n) {
+               _name = n;
+       }
+
+       struct Geometry {
+               Geometry () {}
+
+               Geometry (Position p, Size s)
+                       : position (p)
+                       , size (s)
+               {}
+               
+               Position position;
+               Size size;
+       };
+
+       typedef std::map<Format const *, Geometry> GeometryMap;
+       GeometryMap geometries () const {
+               return _geometries;
+       }
+
+       Position position (Format const *) const;
+       Size size (Format const *) const;
+
+       std::string as_metadata () const;
+       static boost::shared_ptr<Screen> create_from_metadata (std::string);
+
+private:
+       std::string _name;
+       GeometryMap _geometries;
+};

diff --git a/src/lib/server.cc b/src/lib/server.cc
new file mode 100644 (file)
index 0000000..8a5b5cf
--- /dev/null
+++ b/src/lib/server.cc
@@ -0,0 +1,58 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/server.cc
+ *  @brief Class to describe a server to which we can send
+ *  encoding work.
+ */
+
+#include <string>
+#include <vector>
+#include <sstream>
+#include <boost/algorithm/string.hpp>
+#include "server.h"
+
+using namespace std;
+using namespace boost;
+
+/** Create a server from a string of metadata returned from as_metadata().
+ *  @param v Metadata.
+ *  @return Server, or 0.
+ */
+Server *
+Server::create_from_metadata (string v)
+{
+       vector<string> b;
+       split (b, v, is_any_of (" "));
+
+       if (b.size() != 2) {
+               return 0;
+       }
+
+       return new Server (b[0], atoi (b[1].c_str ()));
+}
+
+/** @return Description of this server as text */
+string
+Server::as_metadata () const
+{
+       stringstream s;
+       s << _host_name << " " << _threads;
+       return s.str ();
+}

diff --git a/src/lib/server.h b/src/lib/server.h
new file mode 100644 (file)
index 0000000..f7a0abb
--- /dev/null
+++ b/src/lib/server.h
@@ -0,0 +1,60 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/server.h
+ *  @brief Class to describe a server to which we can send
+ *  encoding work.
+ */
+
+#include <string>
+
+/** @class Server
+ *  @brief Class to describe a server to which we can send encoding work.
+ */
+class Server
+{
+public:
+       /** @param h Server host name or IP address in string form.
+        *  @param t Number of threads to use on the server.
+        */
+       Server (std::string h, int t)
+               : _host_name (h)
+               , _threads (t)
+       {}
+
+       /** @return server's host name or IP address in string form */
+       std::string host_name () const {
+               return _host_name;
+       }
+
+       /** @return number of threads to use on the server */
+       int threads () const {
+               return _threads;
+       }
+
+       std::string as_metadata () const;
+       
+       static Server * create_from_metadata (std::string v);
+
+private:
+       /** server's host name */
+       std::string _host_name;
+       /** number of threads to use on the server */
+       int _threads;
+};

diff --git a/src/lib/shell_command_job.cc b/src/lib/shell_command_job.cc
new file mode 100644 (file)
index 0000000..11805bd
--- /dev/null
+++ b/src/lib/shell_command_job.cc
@@ -0,0 +1,71 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/shell_command_job.cc
+ *  @brief A job which calls a command via a shell.
+ */
+
+#include <stdio.h>
+#include "shell_command_job.h"
+#include "log.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param s Our FilmState.
+ *  @param o Options.
+ *  @param l Log.
+ */
+ShellCommandJob::ShellCommandJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : Job (s, o, l)
+{
+
+}
+
+/** Run a command via a shell.
+ *  @param c Command to run.
+ */
+void
+ShellCommandJob::command (string c)
+{
+       _log->log ("Command: " + c, Log::VERBOSE);
+       
+       int const r = system (c.c_str());
+       if (r < 0) {
+               set_state (FINISHED_ERROR);
+               return;
+       } else if (WEXITSTATUS (r) != 0) {
+               set_error ("command failed");
+               set_state (FINISHED_ERROR);
+       } else {
+               set_state (FINISHED_OK);
+       }
+}
+
+string
+ShellCommandJob::status () const
+{
+       if (!running () && !finished()) {
+               return "Waiting";
+       } else if (running ()) {
+               return "";
+       }
+
+       return Job::status ();
+}

diff --git a/src/lib/shell_command_job.h b/src/lib/shell_command_job.h
new file mode 100644 (file)
index 0000000..e5dd588
--- /dev/null
+++ b/src/lib/shell_command_job.h
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/shell_command_job.h
+ *  @brief A job which calls a command via a shell.
+ */
+
+#ifndef DVDOMATIC_SHELL_COMMAND_JOB_H
+#define DVDOMATIC_SHELL_COMMAND_JOB_H
+
+#include "job.h"
+
+class FilmState;
+class Log;
+
+/** @class ShellCommandJob
+ *  @brief A job which calls a command via a shell.
+ */
+class ShellCommandJob : public Job
+{
+public:
+       ShellCommandJob (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+
+       std::string status () const;
+
+protected:
+       void command (std::string c);
+};
+
+#endif

diff --git a/src/lib/thumbs_job.cc b/src/lib/thumbs_job.cc
new file mode 100644 (file)
index 0000000..0eb116f
--- /dev/null
+++ b/src/lib/thumbs_job.cc
@@ -0,0 +1,68 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/thumbs_job.cc
+ *  @brief A job to create thumbnails.
+ */
+
+#include <exception>
+#include "thumbs_job.h"
+#include "film_state.h"
+#include "tiff_encoder.h"
+#include "transcoder.h"
+#include "options.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param s FilmState to use.
+ *  @param o Options.
+ *  @param l A log that we can write to.
+ */
+ThumbsJob::ThumbsJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : Job (s, o, l)
+{
+       
+}
+
+string
+ThumbsJob::name () const
+{
+       stringstream s;
+       s << "Update thumbs for " << _fs->name;
+       return s.str ();
+}
+
+void
+ThumbsJob::run ()
+{
+       try {
+               shared_ptr<TIFFEncoder> e (new TIFFEncoder (_fs, _opt, _log));
+               Transcoder w (_fs, _opt, this, _log, e);
+               w.go ();
+               set_progress (1);
+               set_state (FINISHED_OK);
+
+       } catch (std::exception& e) {
+
+               set_progress (1);
+               set_error (e.what ());
+               set_state (FINISHED_ERROR);
+       }
+}

diff --git a/src/lib/thumbs_job.h b/src/lib/thumbs_job.h
new file mode 100644 (file)
index 0000000..1dd69a0
--- /dev/null
+++ b/src/lib/thumbs_job.h
@@ -0,0 +1,37 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/thumbs_job.h
+ *  @brief A job to create thumbnails.
+ */
+
+#include "job.h"
+
+class FilmState;
+
+/** @class ThumbsJob
+ *  @brief A job to create thumbnails (single frames of the film spaced out throughout the film).
+ */
+class ThumbsJob : public Job
+{
+public:
+       ThumbsJob (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+       std::string name () const;
+       void run ();
+};

diff --git a/src/lib/tiff_decoder.cc b/src/lib/tiff_decoder.cc
new file mode 100644 (file)
index 0000000..6738de4
--- /dev/null
+++ b/src/lib/tiff_decoder.cc
@@ -0,0 +1,224 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/tiff_decoder.cc
+ *  @brief A decoder which reads a numbered set of TIFF files, one per frame.
+ */
+
+#include <vector>
+#include <string>
+#include <iostream>
+#include <stdint.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/filesystem.hpp>
+#include <tiffio.h>
+extern "C" {
+#include <libavformat/avformat.h>
+}
+#include "util.h"
+#include "tiff_decoder.h"
+#include "film_state.h"
+#include "exceptions.h"
+#include "image.h"
+#include "options.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param fs FilmState of our Film.
+ *  @param o Options.
+ *  @param j Job that we are associated with, or 0.
+ *  @param l Log that we can write to.
+ *  @param minimal true to do the bare minimum of work; just run through the content.  Useful for acquiring
+ *  accurate frame counts as quickly as possible.  This generates no video or audio output.
+ *  @param ignore_length Ignore the content's claimed length when computing progress.
+ */
+TIFFDecoder::TIFFDecoder (boost::shared_ptr<const FilmState> fs, boost::shared_ptr<const Options> o, Job* j, Log* l, bool minimal, bool ignore_length)
+       : Decoder (fs, o, j, l, minimal, ignore_length)
+{
+       string const dir = _fs->content_path ();
+       
+       if (!filesystem::is_directory (dir)) {
+               throw DecodeError ("TIFF content must be in a directory");
+       }
+
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (dir); i != filesystem::directory_iterator(); ++i) {
+               /* Aah, the sweet smell of progress */
+#if BOOST_FILESYSTEM_VERSION == 3
+               string const ext = filesystem::path(*i).extension().string();
+               string const l = filesystem::path(*i).leaf().generic_string();
+#else
+               string const ext = filesystem::path(*i).extension();
+               string const l = i->leaf ();
+#endif
+               if (ext == ".tif" || ext == ".tiff") {
+                       _files.push_back (l);
+               }
+       }
+
+       _files.sort ();
+
+       _iter = _files.begin ();
+
+}
+
+int
+TIFFDecoder::length_in_frames () const
+{
+       return _files.size ();
+}
+
+float
+TIFFDecoder::frames_per_second () const
+{
+       /* We don't know */
+       return 0;
+}
+
+Size
+TIFFDecoder::native_size () const
+{
+       if (_files.empty ()) {
+               throw DecodeError ("no TIFF files found");
+       }
+       
+       TIFF* t = TIFFOpen (file_path (_files.front()).c_str (), "r");
+       if (t == 0) {
+               throw DecodeError ("could not open TIFF file");
+       }
+
+       uint32_t width;
+       TIFFGetField (t, TIFFTAG_IMAGEWIDTH, &width);
+       uint32_t height;
+       TIFFGetField (t, TIFFTAG_IMAGELENGTH, &height);
+
+       return Size (width, height);
+}
+
+int
+TIFFDecoder::audio_channels () const
+{
+       /* No audio */
+       return 0;
+}
+
+int
+TIFFDecoder::audio_sample_rate () const
+{
+       return 0;
+}
+
+AVSampleFormat
+TIFFDecoder::audio_sample_format () const
+{
+       return AV_SAMPLE_FMT_NONE;
+}
+
+bool
+TIFFDecoder::do_pass ()
+{
+       if (_iter == _files.end ()) {
+               return true;
+       }
+
+       TIFF* t = TIFFOpen (file_path (*_iter).c_str (), "r");
+       if (t == 0) {
+               throw DecodeError ("could not open TIFF file");
+       }
+
+       uint32_t width;
+       TIFFGetField (t, TIFFTAG_IMAGEWIDTH, &width);
+       uint32_t height;
+       TIFFGetField (t, TIFFTAG_IMAGELENGTH, &height);
+
+       int const num_pixels = width * height;
+       uint32_t * raster = (uint32_t *) _TIFFmalloc (num_pixels * sizeof (uint32_t));
+       if (raster == 0) {
+               throw DecodeError ("could not allocate memory to decode TIFF file");
+       }
+
+       if (TIFFReadRGBAImage (t, width, height, raster, 0) < 0) {
+               throw DecodeError ("could not read TIFF data");
+       }
+
+       RGBFrameImage image (Size (width, height));
+
+       uint8_t* p = image.data()[0];
+       for (uint32_t y = 0; y < height; ++y) {
+               for (uint32_t x = 0; x < width; ++x) {
+                       uint32_t const i = (height - y - 1) * width + x;
+                       *p++ = raster[i] & 0xff;
+                       *p++ = (raster[i] & 0xff00) >> 8;
+                       *p++ = (raster[i] & 0xff0000) >> 16;
+               }
+       }
+
+       _TIFFfree (raster);
+       TIFFClose (t);
+
+       process_video (image.frame ());
+
+       ++_iter;
+       return false;
+}
+
+/** @param file name within our content directory
+ *  @return full path to the file
+ */
+string
+TIFFDecoder::file_path (string f) const
+{
+       stringstream s;
+       s << _fs->content_path() << "/" << f;
+       return _fs->file (s.str ());
+}
+
+PixelFormat
+TIFFDecoder::pixel_format () const
+{
+       return PIX_FMT_RGB24;
+}
+
+int
+TIFFDecoder::time_base_numerator () const
+{
+       return rint (_fs->frames_per_second);;
+}
+
+
+int
+TIFFDecoder::time_base_denominator () const
+{
+       return 1;
+}
+
+int
+TIFFDecoder::sample_aspect_ratio_numerator () const
+{
+       /* XXX */
+       return 1;
+}
+
+int
+TIFFDecoder::sample_aspect_ratio_denominator () const
+{
+       /* XXX */
+       return 1;
+}
+

diff --git a/src/lib/tiff_decoder.h b/src/lib/tiff_decoder.h
new file mode 100644 (file)
index 0000000..dbd76f3
--- /dev/null
+++ b/src/lib/tiff_decoder.h
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/tiff_decoder.h
+ *  @brief A decoder which reads a numbered set of TIFF files, one per frame.
+ */
+
+#ifndef DVDOMATIC_TIFF_DECODER_H
+#define DVDOMATIC_TIFF_DECODER_H
+
+#include <vector>
+#include <string>
+#include <stdint.h>
+#include <boost/shared_ptr.hpp>
+#include "util.h"
+#include "decoder.h"
+
+class Job;
+class FilmState;
+class Options;
+class Image;
+class Log;
+
+/** @class TIFFDecoder.
+ *  @brief A decoder which reads a numbered set of TIFF files, one per frame.
+ */
+class TIFFDecoder : public Decoder
+{
+public:
+       TIFFDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+
+       /* Methods to query our input video */
+       int length_in_frames () const;
+       float frames_per_second () const;
+       Size native_size () const;
+       int audio_channels () const;
+       int audio_sample_rate () const;
+       AVSampleFormat audio_sample_format () const;
+
+private:
+       bool do_pass ();
+       PixelFormat pixel_format () const;
+       int time_base_numerator () const;
+       int time_base_denominator () const;
+       int sample_aspect_ratio_numerator () const;
+       int sample_aspect_ratio_denominator () const;
+       
+       std::string file_path (std::string) const;
+       std::list<std::string> _files;
+       std::list<std::string>::iterator _iter;
+};
+
+#endif

diff --git a/src/lib/tiff_encoder.cc b/src/lib/tiff_encoder.cc
new file mode 100644 (file)
index 0000000..2cf2380
--- /dev/null
+++ b/src/lib/tiff_encoder.cc
@@ -0,0 +1,77 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/tiff_encoder.h
+ *  @brief An encoder that writes TIFF files (and does nothing with audio).
+ */
+
+#include <stdexcept>
+#include <vector>
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+#include <boost/filesystem.hpp>
+#include <tiffio.h>
+#include "tiff_encoder.h"
+#include "film.h"
+#include "film_state.h"
+#include "options.h"
+#include "exceptions.h"
+#include "image.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param s FilmState of the film that we are encoding.
+ *  @param o Options.
+ *  @param l Log.
+ */
+TIFFEncoder::TIFFEncoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : Encoder (s, o, l)
+{
+       
+}
+
+void
+TIFFEncoder::process_video (shared_ptr<Image> image, int frame)
+{
+       shared_ptr<Image> scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _fs->scaler);
+       string tmp_file = _opt->frame_out_path (frame, true);
+       TIFF* output = TIFFOpen (tmp_file.c_str (), "w");
+       if (output == 0) {
+               throw CreateFileError (tmp_file);
+       }
+                                               
+       TIFFSetField (output, TIFFTAG_IMAGEWIDTH, _opt->out_size.width);
+       TIFFSetField (output, TIFFTAG_IMAGELENGTH, _opt->out_size.height);
+       TIFFSetField (output, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
+       TIFFSetField (output, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+       TIFFSetField (output, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
+       TIFFSetField (output, TIFFTAG_BITSPERSAMPLE, 8);
+       TIFFSetField (output, TIFFTAG_SAMPLESPERPIXEL, 3);
+       
+       if (TIFFWriteEncodedStrip (output, 0, scaled->data()[0], _opt->out_size.width * _opt->out_size.height * 3) == 0) {
+               throw WriteFileError (tmp_file, 0);
+       }
+
+       TIFFClose (output);
+
+       boost::filesystem::rename (tmp_file, _opt->frame_out_path (frame, false));
+       frame_done ();
+}

diff --git a/src/lib/tiff_encoder.h b/src/lib/tiff_encoder.h
new file mode 100644 (file)
index 0000000..ec8e380
--- /dev/null
+++ b/src/lib/tiff_encoder.h
@@ -0,0 +1,43 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/tiff_encoder.h
+ *  @brief An encoder that writes TIFF files (and does nothing with audio).
+ */
+
+#include <string>
+#include <sndfile.h>
+#include "encoder.h"
+
+class FilmState;
+class Log;
+
+/** @class TIFFEncoder
+ *  @brief An encoder that writes TIFF files (and does nothing with audio).
+ */
+class TIFFEncoder : public Encoder
+{
+public:
+       TIFFEncoder (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+
+       void process_begin () {}
+       void process_video (boost::shared_ptr<Image>, int);
+       void process_audio (uint8_t *, int) {}
+       void process_end () {}
+};

diff --git a/src/lib/timer.cc b/src/lib/timer.cc
new file mode 100644 (file)
index 0000000..a45e80d
--- /dev/null
+++ b/src/lib/timer.cc
@@ -0,0 +1,89 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/timer.cc
+ *  @brief Some timing classes for debugging and profiling.
+ */
+
+#include <iostream>
+#include <sys/time.h>
+#include "timer.h"
+#include "util.h"
+
+using namespace std;
+
+/** @param n Name to use when giving output */
+PeriodTimer::PeriodTimer (string n)
+       : _name (n)
+{
+       gettimeofday (&_start, 0);
+}
+
+/** Destroy PeriodTimer and output the time elapsed since its construction */
+PeriodTimer::~PeriodTimer ()
+{
+       struct timeval stop;
+       gettimeofday (&stop, 0);
+       cout << "T: " << _name << ": " << (seconds (stop) - seconds (_start)) << "\n";
+}
+
+/** @param n Name to use when giving output.
+ *  @param s Initial state.
+ */
+StateTimer::StateTimer (string n, string s)
+       : _name (n)
+{
+       struct timeval t;
+       gettimeofday (&t, 0);
+       _time = seconds (t);
+       _state = s;
+}
+
+/** @param s New state that the caller is in */
+void
+StateTimer::set_state (string s)
+{
+       double const last = _time;
+       struct timeval t;
+       gettimeofday (&t, 0);
+       _time = seconds (t);
+
+       if (_totals.find (s) == _totals.end ()) {
+               _totals[s] = 0;
+       }
+
+       _totals[_state] += _time - last;
+       _state = s;
+}
+
+/** Destroy StateTimer and generate a summary of the state timings on cout */
+StateTimer::~StateTimer ()
+{
+       if (_state.empty ()) {
+               return;
+       }
+
+       
+       set_state ("");
+
+       cout << _name << ":\n";
+       for (map<string, double>::iterator i = _totals.begin(); i != _totals.end(); ++i) {
+               cout << "\t" << i->first << " " << i->second << "\n";
+       }
+}

diff --git a/src/lib/timer.h b/src/lib/timer.h
new file mode 100644 (file)
index 0000000..f509a74
--- /dev/null
+++ b/src/lib/timer.h
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2000-2007 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/timer.h
+ *  @brief Some timing classes for debugging and profiling.
+ */
+
+#ifndef DVDOMATIC_TIMER_H
+#define DVDOMATIC_TIMER_H
+
+#include <string>
+#include <map>
+#include <sys/time.h>
+
+/** @class PeriodTimer
+ *  @brief A class to allow timing of a period within the caller.
+ *
+ *  On destruction, it will output the time since its construction.
+ */
+class PeriodTimer
+{
+public:
+       PeriodTimer (std::string n);
+       ~PeriodTimer ();
+       
+private:
+
+       /** name to use when giving output */
+       std::string _name;
+       /** time that this class was constructed */
+       struct timeval _start;
+};
+
+/** @class StateTimer
+ *  @brief A class to allow measurement of the amount of time a program
+ *  spends in one of a set of states.
+ *
+ *  Once constructed, the caller can call set_state() whenever
+ *  its state changes.  When StateTimer is destroyed, it will
+ *  output (to cout) a summary of the time spent in each state.
+ */
+class StateTimer
+{
+public:
+       StateTimer (std::string n, std::string s);
+       ~StateTimer ();
+
+       void set_state (std::string s);
+
+private:
+       /** name to add to the output */
+       std::string _name;
+       /** current state */
+       std::string _state;
+       /** time that _state was entered */
+       double _time;
+       /** time that has been spent in each state so far */
+       std::map<std::string, double> _totals;
+};
+
+#endif

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
new file mode 100644 (file)
index 0000000..652a184
--- /dev/null
+++ b/src/lib/transcode_job.cc
@@ -0,0 +1,100 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/transcode_job.cc
+ *  @brief A job which transcodes from one format to another.
+ */
+
+#include <iostream>
+#include <iomanip>
+#include "transcode_job.h"
+#include "j2k_wav_encoder.h"
+#include "film.h"
+#include "format.h"
+#include "transcoder.h"
+#include "film_state.h"
+#include "log.h"
+#include "encoder_factory.h"
+
+using namespace std;
+using namespace boost;
+
+/** @param s FilmState to use.
+ *  @param o Options.
+ *  @param l A log that we can write to.
+ */
+TranscodeJob::TranscodeJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
+       : Job (s, o, l)
+{
+       
+}
+
+string
+TranscodeJob::name () const
+{
+       stringstream s;
+       s << "Transcode " << _fs->name;
+       return s.str ();
+}
+
+void
+TranscodeJob::run ()
+{
+       try {
+
+               _log->log ("Transcode job starting");
+
+               _encoder = encoder_factory (_fs, _opt, _log);
+               Transcoder w (_fs, _opt, this, _log, _encoder);
+               w.go ();
+               set_progress (1);
+               set_state (FINISHED_OK);
+
+               _log->log ("Transcode job completed successfully");
+
+       } catch (std::exception& e) {
+
+               stringstream s;
+               set_progress (1);
+               set_state (FINISHED_ERROR);
+
+               s << "Transcode job failed (" << e.what() << ")";
+               _log->log (s.str ());
+
+               throw;
+
+       }
+}
+
+string
+TranscodeJob::status () const
+{
+       if (!_encoder) {
+               return "0%";
+       }
+       
+       float const fps = _encoder->current_frames_per_second ();
+       if (fps == 0) {
+               return Job::status ();
+       }
+               
+       stringstream s;
+       s << Job::status () << "; about " << fixed << setprecision (1) << fps << " frames per second.";
+       return s.str ();
+}

diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
new file mode 100644 (file)
index 0000000..aa640f6
--- /dev/null
+++ b/src/lib/transcode_job.h
@@ -0,0 +1,43 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/transcode_job.h
+ *  @brief A job which transcodes from one format to another.
+ */
+
+#include <boost/shared_ptr.hpp>
+#include "job.h"
+
+class Encoder;
+
+/** @class TranscodeJob
+ *  @brief A job which transcodes from one format to another.
+ */
+class TranscodeJob : public Job
+{
+public:
+       TranscodeJob (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Log* l);
+       
+       std::string name () const;
+       void run ();
+       std::string status () const;
+
+private:
+       boost::shared_ptr<Encoder> _encoder;
+};

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
new file mode 100644 (file)
index 0000000..3d71b68
--- /dev/null
+++ b/src/lib/transcoder.cc
@@ -0,0 +1,72 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file  src/transcoder.cc
+ *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
+ *
+ *  A decoder is selected according to the content type, and the encoder can be specified
+ *  as a parameter to the constructor.
+ */
+
+#include <iostream>
+#include <sigc++/signal.h>
+#include "transcoder.h"
+#include "encoder.h"
+#include "decoder_factory.h"
+
+using namespace std;
+using namespace boost;
+
+/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
+ *  @param s FilmState of Film that we are transcoding.
+ *  @param o Options.
+ *  @param j Job that we are running under, or 0.
+ *  @param l Log that we can write to.
+ *  @param e Encoder to use.
+ */
+Transcoder::Transcoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Job* j, Log* l, shared_ptr<Encoder> e)
+       : _job (j)
+       , _encoder (e)
+       , _decoder (decoder_factory (s, o, j, l))
+{
+       assert (_encoder);
+       
+       _decoder->Video.connect (sigc::mem_fun (*e, &Encoder::process_video));
+       _decoder->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
+}
+
+/** Run the decoder, passing its output to the encoder, until the decoder
+ *  has no more data to present.
+ */
+void
+Transcoder::go ()
+{
+       _encoder->process_begin ();
+       try {
+               _decoder->go ();
+       } catch (...) {
+               /* process_end() is important as the decoder may have worker
+                  threads that need to be cleaned up.
+               */
+               _encoder->process_end ();
+               throw;
+       }
+
+       _encoder->process_end ();
+}

diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
new file mode 100644 (file)
index 0000000..ad65309
--- /dev/null
+++ b/src/lib/transcoder.h
@@ -0,0 +1,59 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "decoder.h"
+
+/** @file  src/transcoder.h
+ *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
+ *
+ *  A decoder is selected according to the content type, and the encoder can be specified
+ *  as a parameter to the constructor.
+ */
+
+class Film;
+class Job;
+class Encoder;
+class FilmState;
+
+/** @class Transcoder
+ *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
+ *
+ *  A decoder is selected according to the content type, and the encoder can be specified
+ *  as a parameter to the constructor.
+ */
+class Transcoder
+{
+public:
+       Transcoder (boost::shared_ptr<const FilmState> s, boost::shared_ptr<const Options> o, Job* j, Log* l, boost::shared_ptr<Encoder> e);
+
+       void go ();
+
+       /** @return Our decoder */
+       boost::shared_ptr<Decoder> decoder () {
+               return _decoder;
+       }
+
+protected:
+       /** A Job that is running this Transcoder, or 0 */
+       Job* _job;
+       /** The encoder that we will use */
+       boost::shared_ptr<Encoder> _encoder;
+       /** The decoder that we will use */
+       boost::shared_ptr<Decoder> _decoder;
+};

diff --git a/src/lib/trim_action.h b/src/lib/trim_action.h
new file mode 100644 (file)
index 0000000..405d31b
--- /dev/null
+++ b/src/lib/trim_action.h
@@ -0,0 +1,28 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef DVDOMATIC_TRIM_ACTION_H
+#define DVDOMATIC_TRIM_ACTION_H
+
+enum TrimAction {
+       CUT,        ///< cut everything out after dcp_frames
+       BLACK_OUT ///< black out after dcp_frames so that the film stays the same length (and audio continues)
+};
+
+#endif

diff --git a/src/lib/util.cc b/src/lib/util.cc
new file mode 100644 (file)
index 0000000..b8531e2
--- /dev/null
+++ b/src/lib/util.cc
@@ -0,0 +1,496 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2000-2007 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/lib/util.cc
+ *  @brief Some utility functions and classes.
+ */
+
+#include <sstream>
+#include <iomanip>
+#include <iostream>
+#include <execinfo.h>
+#include <cxxabi.h>
+#include <signal.h>
+#include <sys/types.h> 
+#include <sys/socket.h>
+#include <boost/algorithm/string.hpp>
+#include <openjpeg.h>
+#include <magick/MagickCore.h>
+#include <magick/version.h>
+#include <libssh/libssh.h>
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libswresample/swresample.h>
+#include <libavfilter/avfiltergraph.h>
+#include <libavfilter/avcodec.h>
+#include <libavfilter/buffersink.h>
+#include <libpostproc/postprocess.h>
+#include <libavutil/pixfmt.h>
+}
+#include "util.h"
+#include "exceptions.h"
+#include "scaler.h"
+#include "format.h"
+#include "dcp_content_type.h"
+#include "filter.h"
+#include "screen.h"
+#include "film_state.h"
+#include "player_manager.h"
+
+#ifdef DEBUG_HASH
+#include <mhash.h>
+#endif
+
+using namespace std;
+using namespace boost;
+
+/** Convert some number of seconds to a string representation
+ *  in hours, minutes and seconds.
+ *
+ *  @param s Seconds.
+ *  @return String of the form H:M:S (where H is hours, M
+ *  is minutes and S is seconds).
+ */
+string
+seconds_to_hms (int s)
+{
+       int m = s / 60;
+       s -= (m * 60);
+       int h = m / 60;
+       m -= (h * 60);
+
+       stringstream hms;
+       hms << h << ":";
+       hms.width (2);
+       hms << setfill ('0') << m << ":";
+       hms.width (2);
+       hms << setfill ('0') << s;
+
+       return hms.str ();
+}
+
+/** @param s Number of seconds.
+ *  @return String containing an approximate description of s (e.g. "about 2 hours")
+ */
+string
+seconds_to_approximate_hms (int s)
+{
+       int m = s / 60;
+       s -= (m * 60);
+       int h = m / 60;
+       m -= (h * 60);
+
+       stringstream ap;
+       
+       if (h > 0) {
+               if (m > 30) {
+                       ap << (h + 1) << " hours";
+               } else {
+                       if (h == 1) {
+                               ap << "1 hour";
+                       } else {
+                               ap << h << " hours";
+                       }
+               }
+       } else if (m > 0) {
+               if (m == 1) {
+                       ap << "1 minute";
+               } else {
+                       ap << m << " minutes";
+               }
+       } else {
+               ap << s << " seconds";
+       }
+
+       return ap.str ();
+}
+
+/** @param l Mangled C++ identifier.
+ *  @return Demangled version.
+ */
+static string
+demangle (string l)
+{
+       string::size_type const b = l.find_first_of ("(");
+       if (b == string::npos) {
+               return l;
+       }
+
+       string::size_type const p = l.find_last_of ("+");
+       if (p == string::npos) {
+               return l;
+       }
+
+       if ((p - b) <= 1) {
+               return l;
+       }
+       
+       string const fn = l.substr (b + 1, p - b - 1);
+
+       int status;
+       try {
+               
+               char* realname = abi::__cxa_demangle (fn.c_str(), 0, 0, &status);
+               string d (realname);
+               free (realname);
+               return d;
+               
+       } catch (std::exception) {
+               
+       }
+       
+       return l;
+}
+
+/** Write a stacktrace to an ostream.
+ *  @param out Stream to write to.
+ *  @param levels Number of levels to go up the call stack.
+ */
+void
+stacktrace (ostream& out, int levels)
+{
+       void *array[200];
+       size_t size;
+       char **strings;
+       size_t i;
+     
+       size = backtrace (array, 200);
+       strings = backtrace_symbols (array, size);
+     
+       if (strings) {
+               for (i = 0; i < size && (levels == 0 || i < size_t(levels)); i++) {
+                       out << "  " << demangle (strings[i]) << endl;
+               }
+               
+               free (strings);
+       }
+}
+
+/** @param s Sample format.
+ *  @return String representation.
+ */
+string
+audio_sample_format_to_string (AVSampleFormat s)
+{
+       /* Our sample format handling is not exactly complete */
+       
+       switch (s) {
+       case AV_SAMPLE_FMT_S16:
+               return "S16";
+       default:
+               break;
+       }
+
+       return "Unknown";
+}
+
+/** @param s String representation of a sample format, as returned from audio_sample_format_to_string().
+ *  @return Sample format.
+ */
+AVSampleFormat
+audio_sample_format_from_string (string s)
+{
+       if (s == "S16") {
+               return AV_SAMPLE_FMT_S16;
+       }
+
+       return AV_SAMPLE_FMT_NONE;
+}
+
+/** @return Version of OpenDCP that is on the path (and hence that we will use) */
+static string
+opendcp_version ()
+{
+       FILE* f = popen ("opendcp_xml", "r");
+       if (f == 0) {
+               throw EncodeError ("could not run opendcp_xml to check version");
+       }
+
+       string version = "unknown";
+       
+       while (!feof (f)) {
+               char* buf = 0;
+               size_t n = 0;
+               ssize_t const r = getline (&buf, &n, f);
+               if (r > 0) {
+                       string s (buf);
+                       vector<string> b;
+                       split (b, s, is_any_of (" "));
+                       if (b.size() >= 3 && b[0] == "OpenDCP" && b[1] == "version") {
+                               version = b[2];
+                       }
+                       free (buf);
+               }
+       }
+
+       pclose (f);
+
+       return version;
+}
+
+/** @return Version of vobcopy that is on the path (and hence that we will use) */
+static string
+vobcopy_version ()
+{
+       FILE* f = popen ("vobcopy -V 2>&1", "r");
+       if (f == 0) {
+               throw EncodeError ("could not run vobcopy to check version");
+       }
+
+       string version = "unknown";
+       
+       while (!feof (f)) {
+               char* buf = 0;
+               size_t n = 0;
+               ssize_t const r = getline (&buf, &n, f);
+               if (r > 0) {
+                       string s (buf);
+                       vector<string> b;
+                       split (b, s, is_any_of (" "));
+                       if (b.size() >= 2 && b[0] == "Vobcopy") {
+                               version = b[1];
+                       }
+                       free (buf);
+               }
+       }
+
+       pclose (f);
+
+       return version;
+}
+
+/** @param v Version as used by FFmpeg.
+ *  @return A string representation of v.
+ */
+static string
+ffmpeg_version_to_string (int v)
+{
+       stringstream s;
+       s << ((v & 0xff0000) >> 16) << "." << ((v & 0xff00) >> 8) << "." << (v & 0xff);
+       return s.str ();
+}
+
+/** Return a user-readable string summarising the versions of our dependencies */
+string
+dependency_version_summary ()
+{
+       stringstream s;
+       s << "libopenjpeg " << opj_version () << ", "
+         << "opendcp " << opendcp_version () << ", "
+         << "vobcopy " << vobcopy_version() << ", "
+         << "libswresample " << ffmpeg_version_to_string (swresample_version()) << ", "
+         << "libavcodec " << ffmpeg_version_to_string (avcodec_version()) << ", "
+         << "libavfilter " << ffmpeg_version_to_string (avfilter_version()) << ", "
+         << "libavformat " << ffmpeg_version_to_string (avformat_version()) << ", "
+         << "libavutil " << ffmpeg_version_to_string (avutil_version()) << ", "
+         << "libpostproc " << ffmpeg_version_to_string (postproc_version()) << ", "
+         << "libswscale " << ffmpeg_version_to_string (swscale_version()) << ", "
+         << MagickVersion << ", "
+         << "libssh " << ssh_version (0);
+
+       return s.str ();
+}
+
+/** Write some data to a socket.
+ *  @param fd Socket file descriptor.
+ *  @param data Data.
+ *  @param size Amount to write, in bytes.
+ */
+void
+socket_write (int fd, uint8_t const * data, int size)
+{
+       uint8_t const * p = data;
+       while (size) {
+               int const n = send (fd, p, size, MSG_NOSIGNAL);
+               if (n < 0) {
+                       stringstream s;
+                       s << "could not write (" << strerror (errno) << ")";
+                       throw NetworkError (s.str ());
+               }
+
+               size -= n;
+               p += n;
+       }
+}
+
+double
+seconds (struct timeval t)
+{
+       return t.tv_sec + (double (t.tv_usec) / 1e6);
+}
+
+/** @param fd File descriptor to read from */
+SocketReader::SocketReader (int fd)
+       : _fd (fd)
+       , _buffer_data (0)
+{
+
+}
+
+/** Mark some data as being `consumed', so that it will not be returned
+ *  as data again.
+ *  @param size Amount of data to consume, in bytes.
+ */
+void
+SocketReader::consume (int size)
+{
+       assert (_buffer_data >= size);
+       
+       _buffer_data -= size;
+       if (_buffer_data > 0) {
+               /* Shift still-valid data to the start of the buffer */
+               memmove (_buffer, _buffer + size, _buffer_data);
+       }
+}
+
+/** Read a definite amount of data from our socket, and mark
+ *  it as consumed.
+ *  @param data Where to put the data.
+ *  @param size Number of bytes to read.
+ */
+void
+SocketReader::read_definite_and_consume (uint8_t* data, int size)
+{
+       int const from_buffer = min (_buffer_data, size);
+       if (from_buffer > 0) {
+               /* Get data from our buffer */
+               memcpy (data, _buffer, from_buffer);
+               consume (from_buffer);
+               /* Update our output state */
+               data += from_buffer;
+               size -= from_buffer;
+       }
+
+       /* read() the rest */
+       while (size > 0) {
+               int const n = ::read (_fd, data, size);
+               if (n <= 0) {
+                       throw NetworkError ("could not read");
+               }
+
+               data += n;
+               size -= n;
+       }
+}
+
+/** Read as much data as is available, up to some limit.
+ *  @param data Where to put the data.
+ *  @param size Maximum amount of data to read.
+ */
+void
+SocketReader::read_indefinite (uint8_t* data, int size)
+{
+       assert (size < int (sizeof (_buffer)));
+
+       /* Amount of extra data we need to read () */
+       int to_read = size - _buffer_data;
+       while (to_read > 0) {
+               /* read as much of it as we can (into our buffer) */
+               int const n = ::read (_fd, _buffer + _buffer_data, to_read);
+               if (n <= 0) {
+                       throw NetworkError ("could not read");
+               }
+
+               to_read -= n;
+               _buffer_data += n;
+       }
+
+       assert (_buffer_data >= size);
+
+       /* copy data into the output buffer */
+       assert (size >= _buffer_data);
+       memcpy (data, _buffer, size);
+}
+
+void
+sigchld_handler (int, siginfo_t* info, void *)
+{
+       PlayerManager::instance()->child_exited (info->si_pid);
+}
+
+/** Call the required functions to set up DVD-o-matic's static arrays, etc. */
+void
+dvdomatic_setup ()
+{
+       Format::setup_formats ();
+       DCPContentType::setup_dcp_content_types ();
+       Scaler::setup_scalers ();
+       Filter::setup_filters ();
+
+       struct sigaction sa;
+       sa.sa_flags = SA_SIGINFO;
+       sigemptyset (&sa.sa_mask);
+       sa.sa_sigaction = sigchld_handler;
+       sigaction (SIGCHLD, &sa, 0);
+}
+
+string
+crop_string (Position start, Size size)
+{
+       stringstream s;
+       s << "crop=" << size.width << ":" << size.height << ":" << start.x << ":" << start.y;
+       return s.str ();
+}
+
+vector<string>
+split_at_spaces_considering_quotes (string s)
+{
+       vector<string> out;
+       bool in_quotes = false;
+       string c;
+       for (string::size_type i = 0; i < s.length(); ++i) {
+               if (s[i] == ' ' && !in_quotes) {
+                       out.push_back (c);
+                       c = "";
+               } else if (s[i] == '"') {
+                       in_quotes = !in_quotes;
+               } else {
+                       c += s[i];
+               }
+       }
+
+       out.push_back (c);
+       return out;
+}
+
+#ifdef DEBUG_HASH
+void
+md5_data (string title, void const * data, int size)
+{
+       MHASH ht = mhash_init (MHASH_MD5);
+       if (ht == MHASH_FAILED) {
+               throw EncodeError ("could not create hash thread");
+       }
+
+       mhash (ht, data, size);
+       
+       uint8_t hash[16];
+       mhash_deinit (ht, hash);
+       
+       printf ("%s [%d]: ", title.c_str (), size);
+       for (int i = 0; i < int (mhash_get_block_size (MHASH_MD5)); ++i) {
+               printf ("%.2x", hash[i]);
+       }
+       printf ("\n");
+}
+#endif
+

diff --git a/src/lib/util.h b/src/lib/util.h
new file mode 100644 (file)
index 0000000..3901e7e
--- /dev/null
+++ b/src/lib/util.h
@@ -0,0 +1,121 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2000-2007 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+/** @file src/util.h
+ *  @brief Some utility functions and classes.
+ */
+
+#ifndef DVDOMATIC_UTIL_H
+#define DVDOMATIC_UTIL_H
+
+#include <string>
+#include <vector>
+#include <boost/shared_ptr.hpp>
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavfilter/avfilter.h>
+}
+
+class Scaler;
+
+extern std::string seconds_to_hms (int);
+extern std::string seconds_to_approximate_hms (int);
+extern void stacktrace (std::ostream &, int);
+extern std::string audio_sample_format_to_string (AVSampleFormat);
+extern AVSampleFormat audio_sample_format_from_string (std::string);
+extern std::string dependency_version_summary ();
+extern void socket_write (int, uint8_t const *, int);
+extern double seconds (struct timeval);
+extern void dvdomatic_setup ();
+extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
+
+enum ContentType {
+       STILL,
+       VIDEO
+};
+
+#ifdef DEBUG_HASH
+extern void md5_data (std::string, void const *, int);
+#endif
+
+/** @class SocketReader
+ *  @brief A helper class from reading from sockets.
+ */
+class SocketReader
+{
+public:
+       SocketReader (int);
+
+       void read_definite_and_consume (uint8_t *, int);
+       void read_indefinite (uint8_t *, int);
+       void consume (int);
+
+private:
+       /** file descriptor we are reading from */
+       int _fd;
+       /** a buffer for small reads */
+       uint8_t _buffer[256];
+       /** amount of valid data in the buffer */
+       int _buffer_data;
+};
+
+/** @class Size
+ *  @brief Representation of the size of something */
+struct Size
+{
+       /** Construct a zero Size */
+       Size ()
+               : width (0)
+               , height (0)
+       {}
+
+       /** @param w Width.
+        *  @param h Height.
+        */
+       Size (int w, int h)
+               : width (w)
+               , height (h)
+       {}
+
+       /** width */
+       int width;
+       /** height */
+       int height;
+};
+
+struct Position
+{
+       Position ()
+               : x (0)
+               , y (0)
+       {}
+
+       Position (int x_, int y_)
+               : x (x_)
+               , y (y_)
+       {}
+
+       int x;
+       int y;
+};
+
+extern std::string crop_string (Position, Size);
+
+#endif

diff --git a/src/lib/wscript b/src/lib/wscript
new file mode 100644 (file)
index 0000000..ec5a723
--- /dev/null
+++ b/src/lib/wscript
@@ -0,0 +1,52 @@
+def build(bld):
+    obj = bld(features = 'cxx cxxshlib')
+    obj.name = 'libdvdomatic'
+    obj.export_includes = ['.']
+    obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD OPENJPEG POSTPROC TIFF SIGC++ MAGICK SSH'
+    if bld.env.DEBUG_HASH:
+        obj.uselib += ' MHASH'
+    obj.source = """
+                ab_transcode_job.cc
+                ab_transcoder.cc
+                config.cc
+                copy_from_dvd_job.cc
+                dcp_content_type.cc
+                dcp_video_frame.cc
+                 decoder.cc
+                 decoder_factory.cc
+                 delay_line.cc
+                 dvd.cc
+                encoder.cc
+                 encoder_factory.cc
+                examine_content_job.cc
+                 ffmpeg_decoder.cc
+                film.cc
+                film_state.cc
+                filter.cc
+                format.cc
+                 image.cc
+                 imagemagick_decoder.cc
+                j2k_still_encoder.cc
+                j2k_wav_encoder.cc
+                job.cc
+                job_manager.cc
+                log.cc
+                lut.cc
+                make_dcp_job.cc
+                make_mxf_job.cc
+                 player.cc
+                 player_manager.cc
+                scaler.cc
+                 screen.cc
+                server.cc
+                 scp_dcp_job.cc
+                shell_command_job.cc
+                thumbs_job.cc
+                 tiff_decoder.cc
+                tiff_encoder.cc
+                 timer.cc
+                transcode_job.cc
+                transcoder.cc
+                util.cc
+                """
+    obj.target = 'dvdomatic'

diff --git a/src/tools/alignomatic.cc b/src/tools/alignomatic.cc
new file mode 100644 (file)
index 0000000..9cab6c4
--- /dev/null
+++ b/src/tools/alignomatic.cc
@@ -0,0 +1,317 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <gtkmm.h>
+#include "lib/util.h"
+#include "lib/config.h"
+#include "lib/screen.h"
+#include "lib/format.h"
+#include "gtk/gtk_util.h"
+#include "gtk/alignment.h"
+
+using namespace std;
+using namespace boost;
+
+static Alignment* alignment = 0;
+static Gtk::ComboBoxText* format_combo = 0;
+static Format const * format = 0;
+static Gtk::ComboBoxText* screen_combo = 0;
+static shared_ptr<Screen> screen;
+static Gtk::Button* add_screen = 0;
+static Gtk::Entry* screen_name = 0;
+static Gtk::SpinButton* x_position = 0;
+static Gtk::SpinButton* y_position = 0;
+static Gtk::SpinButton* width = 0;
+static Gtk::Button* calculate_width = 0;
+static Gtk::SpinButton* height = 0;
+static Gtk::Button* calculate_height = 0;
+static Gtk::Button* save = 0;
+static bool screen_dirty = false;
+
+enum GeometryPart {
+       GEOMETRY_PART_X,
+       GEOMETRY_PART_Y,
+       GEOMETRY_PART_WIDTH,
+       GEOMETRY_PART_HEIGHT
+};
+
+void
+update_sensitivity ()
+{
+       bool const dims = format && screen;
+
+       x_position->set_sensitive (dims);
+       y_position->set_sensitive (dims);
+       width->set_sensitive (dims);
+       calculate_width->set_sensitive (dims);
+       height->set_sensitive (dims);
+       calculate_height->set_sensitive (dims);
+
+       screen_name->set_sensitive (screen);
+       save->set_sensitive (screen_dirty);
+}
+
+void
+update_alignment ()
+{
+       if (!screen || !format) {
+               return;
+       }
+
+       delete alignment;
+       alignment = new Alignment (screen->position (format), screen->size (format));
+       alignment->set_text_line (0, screen->name ());
+       alignment->set_text_line (1, format->name ());
+}
+
+void
+update_entries ()
+{
+       if (!screen || !format) {
+               return;
+       }
+       
+       Position p = screen->position (format);
+       x_position->set_value (p.x);
+       y_position->set_value (p.y);
+       Size s = screen->size (format);
+       width->set_value (s.width);
+       height->set_value (s.height);
+
+       update_sensitivity ();
+}
+
+void
+screen_changed ()
+{
+       if (screen_combo->get_active_row_number() < 0) {
+               return;
+       }
+
+       vector<shared_ptr<Screen> > screens = Config::instance()->screens ();
+       
+       if (screens[screen_combo->get_active_row_number()] == screen) {
+               return;
+       }
+       
+       screen = screens[screen_combo->get_active_row_number()];
+
+       update_entries ();
+       update_alignment ();
+
+       screen_name->set_text (screen->name ());
+
+       screen_dirty = false;
+       update_sensitivity ();
+}
+
+void
+format_changed ()
+{
+       vector<Format const *> formats = Format::all ();
+       
+       if (formats[format_combo->get_active_row_number()] == format) {
+               return;
+       }
+       
+       format = formats[format_combo->get_active_row_number()];
+       
+       update_entries ();
+       update_alignment ();
+       update_sensitivity ();
+}
+
+void
+geometry_changed (GeometryPart p)
+{
+       if (p == GEOMETRY_PART_X && screen->position(format).x == x_position->get_value_as_int()) {
+               return;
+       }
+
+       if (p == GEOMETRY_PART_Y && screen->position(format).y == y_position->get_value_as_int()) {
+               return;
+       }
+
+       if (p == GEOMETRY_PART_WIDTH && screen->size(format).width == width->get_value_as_int()) {
+               return;
+       }
+
+       if (p == GEOMETRY_PART_HEIGHT && screen->size(format).height == height->get_value_as_int()) {
+               return;
+       }
+       
+       screen->set_geometry (
+               format,
+               Position (x_position->get_value_as_int(), y_position->get_value_as_int()),
+               Size (width->get_value_as_int(), height->get_value_as_int())
+               );
+
+       update_alignment ();
+
+       screen_dirty = true;
+       update_sensitivity ();
+}
+
+void
+save_clicked ()
+{
+       Config::instance()->write ();
+       screen_dirty = false;
+       update_sensitivity ();
+}
+
+void
+calculate_width_clicked ()
+{
+       width->set_value (height->get_value_as_int() * format->ratio_as_float ());
+}
+
+void
+calculate_height_clicked ()
+{
+       height->set_value (width->get_value_as_int() / format->ratio_as_float ());
+}
+
+void
+update_screen_combo ()
+{
+       screen_combo->clear ();
+       
+       vector<shared_ptr<Screen> > screens = Config::instance()->screens ();
+       for (vector<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
+               screen_combo->append_text ((*i)->name ());
+       }
+}
+
+void
+screen_name_changed ()
+{
+       screen->set_name (screen_name->get_text ());
+
+       int const r = screen_combo->get_active_row_number ();
+       update_screen_combo ();
+       screen_combo->set_active (r);
+
+       screen_dirty = true;
+       update_sensitivity ();
+}
+
+void
+add_screen_clicked ()
+{
+       shared_ptr<Screen> s (new Screen ("New Screen"));
+       vector<shared_ptr<Screen> > screens = Config::instance()->screens ();
+       screens.push_back (s);
+       Config::instance()->set_screens (screens);
+       update_screen_combo ();
+       screen_combo->set_active (screens.size() - 1);
+}
+
+int
+main (int argc, char* argv[])
+{
+       dvdomatic_setup ();
+       
+       Gtk::Main kit (argc, argv);
+       
+       Gtk::Dialog dialog ("Align-o-matic");
+
+       screen_combo = Gtk::manage (new Gtk::ComboBoxText);
+       update_screen_combo ();
+       screen_combo->signal_changed().connect (sigc::ptr_fun (&screen_changed));
+
+       add_screen = Gtk::manage (new Gtk::Button ("Add"));
+       add_screen->signal_clicked().connect (sigc::ptr_fun (&add_screen_clicked));
+       
+       screen_name = Gtk::manage (new Gtk::Entry ());
+       screen_name->signal_changed().connect (sigc::ptr_fun (&screen_name_changed));
+       
+       format_combo = Gtk::manage (new Gtk::ComboBoxText);
+       vector<Format const *> formats = Format::all ();
+       for (vector<Format const *>::iterator i = formats.begin(); i != formats.end(); ++i) {
+               format_combo->append_text ((*i)->name ());
+       }
+
+       format_combo->signal_changed().connect (sigc::ptr_fun (&format_changed));
+
+       save = Gtk::manage (new Gtk::Button ("Save"));
+       save->signal_clicked().connect (sigc::ptr_fun (&save_clicked));
+
+       x_position = Gtk::manage (new Gtk::SpinButton ());
+       x_position->signal_value_changed().connect (sigc::bind (ptr_fun (&geometry_changed), GEOMETRY_PART_X));
+       x_position->set_range (0, 2048);
+       x_position->set_increments (1, 16);
+       y_position = Gtk::manage (new Gtk::SpinButton ());
+       y_position->signal_value_changed().connect (sigc::bind (sigc::ptr_fun (&geometry_changed), GEOMETRY_PART_Y));
+       y_position->set_range (0, 1080);
+       y_position->set_increments (1, 16);
+       width = Gtk::manage (new Gtk::SpinButton ());
+       width->signal_value_changed().connect (sigc::bind (sigc::ptr_fun (&geometry_changed), GEOMETRY_PART_WIDTH));
+       width->set_range (0, 2048);
+       width->set_increments (1, 16);
+       height = Gtk::manage (new Gtk::SpinButton ());
+       height->signal_value_changed().connect (sigc::bind (sigc::ptr_fun (&geometry_changed), GEOMETRY_PART_HEIGHT));
+       height->set_range (0, 1080);
+       height->set_increments (1, 16);
+
+       calculate_width = Gtk::manage (new Gtk::Button ("Calculate"));
+       calculate_width->signal_clicked().connect (sigc::ptr_fun (&calculate_width_clicked));
+       calculate_height = Gtk::manage (new Gtk::Button ("Calculate"));
+       calculate_height->signal_clicked().connect (sigc::ptr_fun (&calculate_height_clicked));
+
+       Gtk::Table table;
+       table.set_row_spacings (12);
+       table.set_col_spacings (12);
+       table.set_border_width (12);
+       
+       int n = 0;
+       table.attach (left_aligned_label ("Screen"), 0, 1, n, n + 1);
+       table.attach (*screen_combo, 1, 2, n, n + 1);
+       table.attach (*add_screen, 2, 3, n, n + 1);
+       ++n;
+       table.attach (left_aligned_label ("Screen Name"), 0, 1, n, n + 1);
+       table.attach (*screen_name, 1, 2, n, n + 1);
+       ++n;
+       table.attach (left_aligned_label ("Format"), 0, 1, n, n + 1);
+       table.attach (*format_combo, 1, 2, n, n + 1);
+       ++n;
+       table.attach (left_aligned_label ("x"), 0, 1, n, n + 1);
+       table.attach (*x_position, 1, 2, n, n + 1);
+       ++n;
+       table.attach (left_aligned_label ("y"), 0, 1, n, n + 1);
+       table.attach (*y_position, 1, 2, n, n + 1);
+       ++n;
+       table.attach (left_aligned_label ("Width"), 0, 1, n, n + 1);
+       table.attach (*width, 1, 2, n, n + 1);
+       table.attach (*calculate_width, 2, 3, n, n + 1);
+       ++n;
+       table.attach (left_aligned_label ("Height"), 0, 1, n, n + 1);
+       table.attach (*height, 1, 2, n, n + 1);
+       table.attach (*calculate_height, 2, 3, n, n + 1);
+       ++n;
+
+       dialog.get_vbox()->pack_start (table, false, false);
+       dialog.add_action_widget (*save, 0);
+       update_sensitivity ();
+       dialog.show_all ();
+
+       Gtk::Main::run (dialog);
+
+       return 0;
+}

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
new file mode 100644 (file)
index 0000000..803eec3
--- /dev/null
+++ b/src/tools/dvdomatic.cc
@@ -0,0 +1,328 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <boost/filesystem.hpp>
+#include "gtk/film_viewer.h"
+#include "gtk/film_editor.h"
+#include "gtk/film_player.h"
+#include "gtk/job_manager_view.h"
+#include "gtk/config_dialog.h"
+#include "gtk/gpl.h"
+#include "gtk/job_wrapper.h"
+#include "lib/film.h"
+#include "lib/format.h"
+#include "lib/config.h"
+#include "lib/filter.h"
+#include "lib/util.h"
+#include "lib/scaler.h"
+
+using namespace std;
+using namespace boost;
+
+static Gtk::Window* window = 0;
+static FilmViewer* film_viewer = 0;
+static FilmEditor* film_editor = 0;
+static FilmPlayer* film_player = 0;
+static Film* film = 0;
+
+class FilmChangedDialog : public Gtk::MessageDialog
+{
+public:
+       FilmChangedDialog ()
+               : Gtk::MessageDialog ("", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE)
+       {
+               stringstream s;
+               s << "Save changes to film \"" << film->name() << "\" before closing?";
+               set_message (s.str ());
+               add_button ("Close _without saving", Gtk::RESPONSE_NO);
+               add_button ("_Cancel", Gtk::RESPONSE_CANCEL);
+               add_button ("_Save", Gtk::RESPONSE_YES);
+       }
+};
+
+bool
+maybe_save_then_delete_film ()
+{
+       if (!film) {
+               return false;
+       }
+                       
+       if (film->dirty ()) {
+               FilmChangedDialog d;
+               switch (d.run ()) {
+               case Gtk::RESPONSE_CANCEL:
+                       return true;
+               case Gtk::RESPONSE_YES:
+                       film->write_metadata ();
+                       break;
+               case Gtk::RESPONSE_NO:
+                       return false;
+               }
+       }
+       
+       delete film;
+       film = 0;
+       return false;
+}
+
+void
+file_new ()
+{
+       Gtk::FileChooserDialog c (*window, "New Film", Gtk::FILE_CHOOSER_ACTION_CREATE_FOLDER);
+       c.add_button ("_Cancel", Gtk::RESPONSE_CANCEL);
+       c.add_button ("C_reate", Gtk::RESPONSE_ACCEPT);
+
+       int const r = c.run ();
+       if (r == Gtk::RESPONSE_ACCEPT) {
+               if (maybe_save_then_delete_film ()) {
+                       return;
+               }
+               film = new Film (c.get_filename ());
+#if BOOST_FILESYSTEM_VERSION == 3              
+               film->set_name (filesystem::path (c.get_filename().c_str()).filename().generic_string());
+#else          
+               film->set_name (filesystem::path (c.get_filename().c_str()).filename());
+#endif         
+               film_viewer->set_film (film);
+               film_editor->set_film (film);
+       }
+}
+
+void
+file_open ()
+{
+       Gtk::FileChooserDialog c (*window, "Open Film", Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
+       c.add_button ("_Cancel", Gtk::RESPONSE_CANCEL);
+       c.add_button ("_Open", Gtk::RESPONSE_ACCEPT);
+
+       int const r = c.run ();
+       if (r == Gtk::RESPONSE_ACCEPT) {
+               if (maybe_save_then_delete_film ()) {
+                       return;
+               }
+               film = new Film (c.get_filename ());
+               film_viewer->set_film (film);
+               film_editor->set_film (film);
+       }
+}
+
+void
+file_save ()
+{
+       film->write_metadata ();
+}
+
+void
+file_quit ()
+{
+       if (maybe_save_then_delete_film ()) {
+               return;
+       }
+       
+       Gtk::Main::quit ();
+}
+
+void
+edit_preferences ()
+{
+       ConfigDialog d;
+       d.run ();
+       Config::instance()->write ();
+}
+
+void
+jobs_make_dcp ()
+{
+       JobWrapper::make_dcp (film, true);
+}
+
+void
+jobs_make_dcp_from_existing_transcode ()
+{
+       JobWrapper::make_dcp (film, false);
+}
+
+void
+jobs_copy_from_dvd ()
+{
+       film->copy_from_dvd ();
+}
+
+void
+jobs_send_dcp_to_tms ()
+{
+       film->send_dcp_to_tms ();
+}
+
+void
+jobs_examine_content ()
+{
+       film->examine_content ();
+}
+
+void
+help_about ()
+{
+       Gtk::AboutDialog d;
+       d.set_name ("DVD-o-matic");
+       d.set_version (DVDOMATIC_VERSION);
+
+       stringstream s;
+       s << "DCP generation from arbitrary formats\n\n"
+         << "Using " << dependency_version_summary() << "\n";
+       d.set_comments (s.str ());
+
+       vector<string> authors;
+       authors.push_back ("Carl Hetherington");
+       authors.push_back ("Terrence Meiczinger");
+       authors.push_back ("Paul Davis");
+       d.set_authors (authors);
+
+       d.set_website ("http://carlh.net/software/dvdomatic");
+       d.set_license (gpl);
+       
+       d.run ();
+}
+
+void
+setup_menu (Gtk::MenuBar& m)
+{
+       using namespace Gtk::Menu_Helpers;
+
+       Gtk::Menu* file = manage (new Gtk::Menu);
+       MenuList& file_items (file->items ());
+       file_items.push_back (MenuElem ("_New...", sigc::ptr_fun (file_new)));
+       file_items.push_back (MenuElem ("_Open...", sigc::ptr_fun (file_open)));
+       file_items.push_back (SeparatorElem ());
+       file_items.push_back (MenuElem ("_Save", sigc::ptr_fun (file_save)));
+       file_items.push_back (SeparatorElem ());
+       file_items.push_back (MenuElem ("_Quit", sigc::ptr_fun (file_quit)));
+
+       Gtk::Menu* edit = manage (new Gtk::Menu);
+       MenuList& edit_items (edit->items ());
+       edit_items.push_back (MenuElem ("_Preferences...", sigc::ptr_fun (edit_preferences)));
+
+       Gtk::Menu* jobs = manage (new Gtk::Menu);
+       MenuList& jobs_items (jobs->items ());
+       jobs_items.push_back (MenuElem ("_Make DCP", sigc::ptr_fun (jobs_make_dcp)));
+       jobs_items.push_back (MenuElem ("_Send DCP to TMS", sigc::ptr_fun (jobs_send_dcp_to_tms)));
+       jobs_items.push_back (MenuElem ("Copy from _DVD", sigc::ptr_fun (jobs_copy_from_dvd)));
+       jobs_items.push_back (MenuElem ("_Examine content", sigc::ptr_fun (jobs_examine_content)));
+       jobs_items.push_back (MenuElem ("Make DCP from _existing transcode", sigc::ptr_fun (jobs_make_dcp_from_existing_transcode)));
+
+       Gtk::Menu* help = manage (new Gtk::Menu);
+       MenuList& help_items (help->items ());
+       help_items.push_back (MenuElem ("_About", sigc::ptr_fun (help_about)));
+       
+       MenuList& items (m.items ());
+       items.push_back (MenuElem ("_File", *file));
+       items.push_back (MenuElem ("_Edit", *edit));
+       items.push_back (MenuElem ("_Jobs", *jobs));
+       items.push_back (MenuElem ("_Help", *help));
+}
+
+bool
+window_closed (GdkEventAny *)
+{
+       if (maybe_save_then_delete_film ()) {
+               return true;
+       }
+
+       return false;
+}
+
+void
+file_changed (string f)
+{
+       stringstream s;
+       s << "DVD-o-matic";
+       if (!f.empty ()) {
+               s << " — " << f;
+       }
+       
+       window->set_title (s.str ());
+}
+
+int
+main (int argc, char* argv[])
+{
+       dvdomatic_setup ();
+       
+       Gtk::Main kit (argc, argv);
+
+       if (argc == 2 && boost::filesystem::is_directory (argv[1])) {
+               film = new Film (argv[1]);
+       }
+
+       window = new Gtk::Window ();
+       window->signal_delete_event().connect (sigc::ptr_fun (window_closed));
+       
+       film_viewer = new FilmViewer (film);
+       film_editor = new FilmEditor (film);
+       film_player = new FilmPlayer (film);
+       JobManagerView jobs_view;
+
+       window->set_title ("DVD-o-matic");
+
+       Gtk::VBox vbox;
+
+       Gtk::MenuBar menu_bar;
+       vbox.pack_start (menu_bar, false, false);
+       setup_menu (menu_bar);
+
+       Gtk::HBox hbox;
+       hbox.set_spacing (12);
+
+       Gtk::VBox left_vbox;
+       left_vbox.set_spacing (12);
+       left_vbox.pack_start (film_editor->widget (), false, false);
+//     left_vbox.pack_start (film_player->widget (), false, false);
+       hbox.pack_start (left_vbox, false, false);
+
+       Gtk::VBox right_vbox;
+       right_vbox.pack_start (film_viewer->widget (), true, true);
+       right_vbox.pack_start (jobs_view.widget(), false, false);
+       hbox.pack_start (right_vbox, true, true);
+
+       vbox.pack_start (hbox, true, true);
+
+       window->add (vbox);
+       window->show_all ();
+
+       /* XXX: calling these here is a bit of a hack */
+       film_editor->setup_visibility ();
+       film_player->setup_visibility ();
+       film_viewer->setup_visibility ();
+
+       film_editor->FileChanged.connect (ptr_fun (file_changed));
+       if (film) {
+               file_changed (film->directory ());
+       } else {
+               file_changed ("");
+       }
+
+       /* XXX this should be in JobManagerView, shouldn't it? */
+       Glib::signal_timeout().connect (sigc::bind_return (sigc::mem_fun (jobs_view, &JobManagerView::update), true), 1000);
+
+       window->maximize ();
+       Gtk::Main::run (*window);
+
+       return 0;
+}

diff --git a/src/tools/fixlengths.cc b/src/tools/fixlengths.cc
new file mode 100644 (file)
index 0000000..52696cd
--- /dev/null
+++ b/src/tools/fixlengths.cc
@@ -0,0 +1,209 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <stdexcept>
+#include <iostream>
+#include <iomanip>
+#include <getopt.h>
+#include <sndfile.h>
+#include <boost/filesystem.hpp>
+#include "lib/film.h"
+
+using namespace std;
+using namespace boost;
+
+void
+help (string n)
+{
+       cerr << "Syntax: " << n << " [--help] [--chop-audio-start] [--chop-audio-end] --film <film>\n";
+}
+
+void
+sox (vector<string> const & audio_files, string const & process)
+{
+       for (vector<string>::const_iterator i = audio_files.begin(); i != audio_files.end(); ++i) {
+               stringstream cmd;
+               cmd << "sox \"" << *i << "\" -t wav \"" << *i << ".tmp\" " << process;
+               cout << "> " << cmd.str() << "\n";
+               int r = ::system (cmd.str().c_str());
+               if (r == -1 || WEXITSTATUS (r) != 0) {
+                       cerr << "fixlengths: call to sox failed.\n";
+                       exit (EXIT_FAILURE);
+               }
+               filesystem::rename (*i + ".tmp", *i);
+       }
+}
+
+int main (int argc, char* argv[])
+{
+       string film_dir;
+       bool chop_audio_start = false;
+       bool chop_audio_end = false;
+       bool pad_audio_end = false;
+       
+       while (1) {
+               static struct option long_options[] = {
+                       { "help", no_argument, 0, 'h' },
+                       { "chop-audio-start", no_argument, 0, 'c' },
+                       { "chop-audio-end", no_argument, 0, 'd' },
+                       { "pad-audio-end", no_argument, 0, 'p' },
+                       { "film", required_argument, 0, 'f' },
+                       { 0, 0, 0, 0 }
+               };
+
+               int option_index = 0;
+               int c = getopt_long (argc, argv, "hcf:", long_options, &option_index);
+
+               if (c == -1) {
+                       break;
+               }
+
+               switch (c) {
+               case 'h':
+                       help (argv[0]);
+                       exit (EXIT_SUCCESS);
+               case 'c':
+                       chop_audio_start = true;
+                       break;
+               case 'd':
+                       chop_audio_end = true;
+                       break;
+               case 'p':
+                       pad_audio_end = true;
+                       break;
+               case 'f':
+                       film_dir = optarg;
+                       break;
+               }
+       }
+
+       if (film_dir.empty ()) {
+               help (argv[0]);
+               exit (EXIT_FAILURE);
+       }
+
+       dvdomatic_setup ();
+
+       Film* film = 0;
+       try {
+               film = new Film (film_dir, true);
+       } catch (std::exception& e) {
+               cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
+               exit (EXIT_FAILURE);
+       }
+
+       /* XXX: hack */
+       int video_frames = 0;
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (film->j2k_dir()); i != filesystem::directory_iterator(); ++i) {
+               ++video_frames;
+       }
+
+       float const video_length = video_frames / film->frames_per_second();
+       cout << "Video length: " << video_length << " (" << video_frames << " frames at " << film->frames_per_second() << " frames per second).\n";
+
+       vector<string> audio_files = film->audio_files ();
+       if (audio_files.empty ()) {
+               cerr << argv[0] << ": film has no audio files.\n";
+               exit (EXIT_FAILURE);
+       }
+
+       sf_count_t audio_frames = 0;
+       int audio_sample_rate = 0;
+
+       for (vector<string>::iterator i = audio_files.begin(); i != audio_files.end(); ++i) {
+               SF_INFO info;
+               info.format = 0;
+               SNDFILE* sf = sf_open (i->c_str(), SFM_READ, &info);
+               if (sf == 0) {
+                       cerr << argv[0] << ": could not open WAV file for reading.\n";
+                       exit (EXIT_FAILURE);
+               }
+
+               if (audio_frames == 0) {
+                       audio_frames = info.frames;
+               }
+
+               if (audio_sample_rate == 0) {
+                       audio_sample_rate = info.samplerate;
+               }
+
+               if (audio_frames != info.frames) {
+                       cerr << argv[0] << ": audio files have differing lengths.\n";
+                       exit (EXIT_FAILURE);
+               }
+
+               if (audio_sample_rate != info.samplerate) {
+                       cerr << argv[0] << ": audio files have differing sample rates.\n";
+                       exit (EXIT_FAILURE);
+               }
+
+               sf_close (sf);
+       }
+
+       float const audio_length = audio_frames / float (audio_sample_rate);
+
+       cout << "Audio length: " << audio_length << " (" << audio_frames << " frames at " << audio_sample_rate << " frames per second).\n";
+
+       cout << "\n";
+
+       if (audio_length > video_length) {
+               cout << setprecision (3);
+               cout << "Audio " << (audio_length - video_length) << "s longer than video.\n";
+               
+               float const delta = audio_length - video_length;
+               int const delta_samples = delta * audio_sample_rate;
+               
+               if (chop_audio_start) {
+                       cout << "Chopping difference off the start of the audio.\n";
+
+                       stringstream s;
+                       s << "trim " << delta_samples << "s";
+                       sox (audio_files, s.str ());
+                       
+               } else if (chop_audio_end) {
+                       cout << "Chopping difference off the end of the audio.\n";
+
+                       stringstream s;
+                       s << "reverse trim " << delta_samples << "s reverse";
+                       sox (audio_files, s.str ());
+
+               } else {
+                       cout << "Re-run with --chop-audio-start or --chop-audio-end, perhaps.\n";
+               }
+
+       } else if (audio_length < video_length) {
+               cout << setprecision (3);
+               cout << "Audio " << (video_length - audio_length) << "s shorter than video.\n";
+
+               if (pad_audio_end) {
+
+                       float const delta = video_length - audio_length;
+                       int const delta_samples = delta * audio_sample_rate;
+                       stringstream s;
+                       s << "pad 0 " << delta_samples << "s";
+                       sox (audio_files, s.str ());
+               
+               } else {
+                       cout << "Re-run with --pad-audio-end, perhaps.\n";
+               }
+       }
+       
+
+       return 0;
+}

diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
new file mode 100644 (file)
index 0000000..76cda82
--- /dev/null
+++ b/src/tools/makedcp.cc
@@ -0,0 +1,138 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <iomanip>
+#include <getopt.h>
+#include "format.h"
+#include "film.h"
+#include "filter.h"
+#include "transcode_job.h"
+#include "make_mxf_job.h"
+#include "make_dcp_job.h"
+#include "job_manager.h"
+#include "ab_transcode_job.h"
+#include "util.h"
+#include "scaler.h"
+
+using namespace std;
+using namespace boost;
+
+static void
+help (string n)
+{
+       cerr << "Syntax: " << n << " [--help] [--deps] [--film <film>]\n";
+}
+
+int
+main (int argc, char* argv[])
+{
+       string film_dir;
+
+       while (1) {
+               static struct option long_options[] = {
+                       { "help", no_argument, 0, 'h'},
+                       { "deps", no_argument, 0, 'd'},
+                       { "film", required_argument, 0, 'f'},
+                       { 0, 0, 0, 0 }
+               };
+
+               int option_index = 0;
+               int c = getopt_long (argc, argv, "hdf:", long_options, &option_index);
+
+               if (c == -1) {
+                       break;
+               }
+
+               switch (c) {
+               case 'h':
+                       help (argv[0]);
+                       exit (EXIT_SUCCESS);
+               case 'd':
+                       cout << dependency_version_summary () << "\n";
+                       exit (EXIT_SUCCESS);
+               case 'f':
+                       film_dir = optarg;
+                       break;
+               }
+       }
+
+       if (film_dir.empty ()) {
+               help (argv[0]);
+               exit (EXIT_FAILURE);
+       }
+                       
+       dvdomatic_setup ();
+
+       Film* film = 0;
+       try {
+               film = new Film (film_dir, true);
+       } catch (std::exception& e) {
+               cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
+               exit (EXIT_FAILURE);
+       }
+
+       cout << "\nMaking ";
+       if (film->dcp_ab ()) {
+               cout << "A/B ";
+       }
+       cout << "DCP for " << film->name() << "\n";
+       cout << "Content: " << film->content() << "\n";
+       pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
+       cout << "Filters: " << f.first << " " << f.second << "\n";
+
+       film->make_dcp (true);
+
+       list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
+
+       bool all_done = false;
+       bool first = true;
+       while (!all_done) {
+               
+               sleep (5);
+               
+               if (!first) {
+                       cout << "\033[" << jobs.size() << "A";
+                       cout.flush ();
+               }
+
+               first = false;
+               
+               all_done = true;
+               for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
+                       cout << (*i)->name() << ": ";
+
+                       float const p = (*i)->overall_progress ();
+
+                       if (p >= 0) {
+                               cout << (*i)->status() << "                         \n";
+                       } else {
+                               cout << ": Running           \n";
+                       }
+                       
+                       if (!(*i)->finished ()) {
+                               all_done = false;
+                       }
+               }
+       }
+
+       return 0;
+}
+
+         

diff --git a/src/tools/playomatic.cc b/src/tools/playomatic.cc
new file mode 100644 (file)
index 0000000..b6fcd43
--- /dev/null
+++ b/src/tools/playomatic.cc
@@ -0,0 +1,67 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include "lib/util.h"
+#include "gtk/film_player.h"
+#include "gtk/film_list.h"
+
+using namespace std;
+
+static FilmPlayer* film_player = 0;
+
+void
+film_changed (Film const * f)
+{
+       film_player->set_film (f);
+}
+
+int
+main (int argc, char* argv[])
+{
+       dvdomatic_setup ();
+
+       Gtk::Main kit (argc, argv);
+
+       if (argc != 2) {
+               cerr << "Syntax: " << argv[0] << " <directory>\n";
+               exit (EXIT_FAILURE);
+       }
+
+       Gtk::Window* window = new Gtk::Window ();
+
+       FilmList* film_list = new FilmList (argv[1]);
+       film_player = new FilmPlayer ();
+
+       Gtk::HBox hbox;
+       hbox.pack_start (film_list->widget(), true, true);
+       hbox.pack_start (film_player->widget(), true, true);
+
+       film_list->SelectionChanged.connect (sigc::ptr_fun (&film_changed));
+       
+       window->set_title ("Play-o-matic");
+       window->add (hbox);
+       window->show_all ();
+       
+       window->maximize ();
+       Gtk::Main::run (*window);
+
+       return 0;
+}
+

diff --git a/src/tools/run_film_editor b/src/tools/run_film_editor
new file mode 100755 (executable)
index 0000000..3a3079e
--- /dev/null
+++ b/src/tools/run_film_editor
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:build/src
+build/tools/film_editor $*

diff --git a/src/tools/servomatic.cc b/src/tools/servomatic.cc
new file mode 100644 (file)
index 0000000..b312af3
--- /dev/null
+++ b/src/tools/servomatic.cc
@@ -0,0 +1,238 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <stdexcept>
+#include <sstream>
+#include <cstring>
+#include <vector>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h> 
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition.hpp>
+#include "config.h"
+#include "dcp_video_frame.h"
+#include "exceptions.h"
+#include "util.h"
+#include "config.h"
+#include "scaler.h"
+#include "image.h"
+#include "log.h"
+
+#define BACKLOG 8
+
+using namespace std;
+using namespace boost;
+
+static vector<thread *> worker_threads;
+
+static std::list<int> queue;
+static mutex worker_mutex;
+static condition worker_condition;
+static Log log_ ("servomatic.log");
+
+int
+process (int fd)
+{
+       SocketReader reader (fd);
+       
+       char buffer[128];
+       reader.read_indefinite ((uint8_t *) buffer, sizeof (buffer));
+       reader.consume (strlen (buffer) + 1);
+       
+       stringstream s (buffer);
+       
+       string command;
+       s >> command;
+       if (command != "encode") {
+               close (fd);
+               return -1;
+       }
+       
+       Size in_size;
+       int pixel_format_int;
+       Size out_size;
+       int padding;
+       string scaler_id;
+       int frame;
+       float frames_per_second;
+       string post_process;
+       int colour_lut_index;
+       int j2k_bandwidth;
+       
+       s >> in_size.width >> in_size.height
+         >> pixel_format_int
+         >> out_size.width >> out_size.height
+         >> padding
+         >> scaler_id
+         >> frame
+         >> frames_per_second
+         >> post_process
+         >> colour_lut_index
+         >> j2k_bandwidth;
+       
+       PixelFormat pixel_format = (PixelFormat) pixel_format_int;
+       Scaler const * scaler = Scaler::from_id (scaler_id);
+       if (post_process == "none") {
+               post_process = "";
+       }
+       
+       shared_ptr<SimpleImage> image (new SimpleImage (pixel_format, in_size));
+       
+       for (int i = 0; i < image->components(); ++i) {
+               int line_size;
+               s >> line_size;
+               image->set_line_size (i, line_size);
+       }
+       
+       for (int i = 0; i < image->components(); ++i) {
+               reader.read_definite_and_consume (image->data()[i], image->line_size()[i] * image->lines(i));
+       }
+       
+#ifdef DEBUG_HASH
+       image->hash ("Image for encoding (as received by server)");
+#endif         
+       
+       DCPVideoFrame dcp_video_frame (image, out_size, padding, scaler, frame, frames_per_second, post_process, colour_lut_index, j2k_bandwidth, &log_);
+       shared_ptr<EncodedData> encoded = dcp_video_frame.encode_locally ();
+       encoded->send (fd);
+
+#ifdef DEBUG_HASH
+       encoded->hash ("Encoded image (as made by server and as sent back)");
+#endif         
+
+       
+       return frame;
+}
+
+void
+worker_thread ()
+{
+       while (1) {
+               mutex::scoped_lock lock (worker_mutex);
+               while (queue.empty ()) {
+                       worker_condition.wait (lock);
+               }
+
+               int fd = queue.front ();
+               queue.pop_front ();
+               
+               lock.unlock ();
+
+               int frame = -1;
+
+               struct timeval start;
+               gettimeofday (&start, 0);
+               
+               try {
+                       frame = process (fd);
+               } catch (std::exception& e) {
+                       cerr << "Error: " << e.what() << "\n";
+               }
+               
+               close (fd);
+               
+               lock.lock ();
+
+               if (frame >= 0) {
+                       struct timeval end;
+                       gettimeofday (&end, 0);
+                       cout << "Encoded frame " << frame << " in " << (seconds (end) - seconds (start)) << "\n";
+               }
+               
+               worker_condition.notify_all ();
+       }
+}
+
+int
+main ()
+{
+       Scaler::setup_scalers ();
+
+       int const num_threads = Config::instance()->num_local_encoding_threads ();
+       
+       for (int i = 0; i < num_threads; ++i) {
+               worker_threads.push_back (new thread (worker_thread));
+       }
+       
+       int fd = socket (AF_INET, SOCK_STREAM, 0);
+       if (fd < 0) {
+               throw NetworkError ("could not open socket");
+       }
+
+       int const o = 1;
+       setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &o, sizeof (o));
+
+       struct timeval tv;
+       tv.tv_sec = 20;
+       tv.tv_usec = 0;
+       setsockopt (fd, SOL_SOCKET, SO_RCVTIMEO, (void *) &tv, sizeof (tv));
+       setsockopt (fd, SOL_SOCKET, SO_SNDTIMEO, (void *) &tv, sizeof (tv));
+
+       struct sockaddr_in server_address;
+       memset (&server_address, 0, sizeof (server_address));
+       server_address.sin_family = AF_INET;
+       server_address.sin_addr.s_addr = INADDR_ANY;
+       server_address.sin_port = htons (Config::instance()->server_port ());
+       if (::bind (fd, (struct sockaddr *) &server_address, sizeof (server_address)) < 0) {
+               stringstream s;
+               s << "could not bind to port " << Config::instance()->server_port() << " (" << strerror (errno) << ")";
+               throw NetworkError (s.str());
+       }
+
+       listen (fd, BACKLOG);
+
+       while (1) {
+               struct sockaddr_in client_address;
+               socklen_t client_length = sizeof (client_address);
+               int new_fd = accept (fd, (struct sockaddr *) &client_address, &client_length);
+               if (new_fd < 0) {
+                       if (errno != EAGAIN && errno != EWOULDBLOCK) {
+                               throw NetworkError ("accept failed");
+                       }
+
+                       continue;
+               }
+
+               mutex::scoped_lock lock (worker_mutex);
+               
+               /* Wait until the queue has gone down a bit */
+               while (int (queue.size()) >= num_threads * 2) {
+                       worker_condition.wait (lock);
+               }
+
+               struct timeval tv;
+               tv.tv_sec = 20;
+               tv.tv_usec = 0;
+               setsockopt (new_fd, SOL_SOCKET, SO_RCVTIMEO, (void *) &tv, sizeof (tv));
+               setsockopt (new_fd, SOL_SOCKET, SO_SNDTIMEO, (void *) &tv, sizeof (tv));
+               
+               queue.push_back (new_fd);
+               worker_condition.notify_all ();
+       }
+       
+       close (fd);
+
+       return 0;
+}

diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
new file mode 100644 (file)
index 0000000..0f37e73
--- /dev/null
+++ b/src/tools/servomatictest.cc
@@ -0,0 +1,159 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <iomanip>
+#include <exception>
+#include <getopt.h>
+#include "format.h"
+#include "film.h"
+#include "filter.h"
+#include "util.h"
+#include "scaler.h"
+#include "server.h"
+#include "dcp_video_frame.h"
+#include "options.h"
+#include "decoder.h"
+#include "exceptions.h"
+#include "scaler.h"
+#include "log.h"
+#include "decoder_factory.h"
+
+using namespace std;
+using namespace boost;
+
+static Server* server;
+static Log log_ ("servomatictest.log");
+
+void
+process_video (shared_ptr<Image> image, int frame)
+{
+       shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (image, Size (1024, 1024), 0, Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, &log_));
+       shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image, Size (1024, 1024), 0, Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, &log_));
+
+#if defined(DEBUG_HASH)
+       cout << "Frame " << frame << ":\n";
+#else
+       cout << "Frame " << frame << ": ";
+       cout.flush ();
+#endif 
+
+       shared_ptr<EncodedData> local_encoded = local->encode_locally ();
+       shared_ptr<EncodedData> remote_encoded;
+
+       string remote_error;
+       try {
+               remote_encoded = remote->encode_remotely (server);
+       } catch (NetworkError& e) {
+               remote_error = e.what ();
+       }
+
+#if defined(DEBUG_HASH)
+       cout << "Frame " << frame << ": ";
+       cout.flush ();
+#endif 
+
+       if (!remote_error.empty ()) {
+               cout << "\033[0;31mnetwork problem: " << remote_error << "\033[0m\n";
+               return;
+       }
+
+       if (local_encoded->size() != remote_encoded->size()) {
+               cout << "\033[0;31msizes differ\033[0m\n";
+               return;
+       }
+               
+       uint8_t* p = local_encoded->data();
+       uint8_t* q = remote_encoded->data();
+       for (int i = 0; i < local_encoded->size(); ++i) {
+               if (*p++ != *q++) {
+                       cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";
+                       return;
+               }
+       }
+
+       cout << "\033[0;32mgood\033[0m\n";
+}
+
+static void
+help (string n)
+{
+       cerr << "Syntax: " << n << " [--help] --film <film> --server <host>\n";
+       exit (EXIT_FAILURE);
+}
+
+int
+main (int argc, char* argv[])
+{
+       string film_dir;
+       string server_host;
+
+       while (1) {
+               static struct option long_options[] = {
+                       { "help", no_argument, 0, 'h'},
+                       { "server", required_argument, 0, 's'},
+                       { "film", required_argument, 0, 'f'},
+                       { 0, 0, 0, 0 }
+               };
+
+               int option_index = 0;
+               int c = getopt_long (argc, argv, "hs:f:", long_options, &option_index);
+
+               if (c == -1) {
+                       break;
+               }
+
+               switch (c) {
+               case 'h':
+                       help (argv[0]);
+                       exit (EXIT_SUCCESS);
+               case 's':
+                       server_host = optarg;
+                       break;
+               case 'f':
+                       film_dir = optarg;
+                       break;
+               }
+       }
+       
+       if (server_host.empty() || film_dir.empty()) {
+               help (argv[0]);
+               exit (EXIT_FAILURE);
+       }
+
+       dvdomatic_setup ();
+
+       server = new Server (server_host, 1);
+       Film film (film_dir, true);
+
+       shared_ptr<Options> opt (new Options ("fred", "jim", "sheila"));
+       opt->out_size = Size (1024, 1024);
+       opt->apply_crop = false;
+       opt->decode_audio = false;
+
+       shared_ptr<Decoder> decoder = decoder_factory (film.state_copy(), opt, 0, &log_);
+       try {
+               decoder->Video.connect (sigc::ptr_fun (process_video));
+               decoder->go ();
+       } catch (std::exception& e) {
+               cerr << "Error: " << e.what() << "\n";
+       }
+
+       return 0;
+}

diff --git a/src/tools/test.cc b/src/tools/test.cc
new file mode 100644 (file)
index 0000000..f818141
--- /dev/null
+++ b/src/tools/test.cc
@@ -0,0 +1,15 @@
+#include <stdint.h>
+#include <boost/shared_ptr.hpp>
+#include "image.h"
+#include "server.h"
+
+using namespace boost;
+
+int main ()
+{
+       uint8_t* rgb = new uint8_t[256];
+       shared_ptr<Image> image (new Image (rgb, 0, 32, 32, 24));
+       Server* s = new Server ("localhost", 2);
+       image->encode_remotely (s);
+       return 0;
+}

diff --git a/src/tools/wscript b/src/tools/wscript
new file mode 100644 (file)
index 0000000..919c98e
--- /dev/null
+++ b/src/tools/wscript
@@ -0,0 +1,17 @@
+def build(bld):
+    for t in ['makedcp', 'servomatic', 'servomatictest', 'fixlengths']:
+        obj = bld(features = 'cxx cxxprogram')
+       obj.uselib = 'BOOST_THREAD'
+       obj.includes = ['..']
+        obj.use    = ['libdvdomatic']
+        obj.source = '%s.cc' % t
+        obj.target = t
+
+    if not bld.env.DISABLE_GUI:
+        for t in ['dvdomatic', 'playomatic', 'alignomatic']:
+            obj = bld(features = 'cxx cxxprogram')
+            obj.uselib = 'BOOST_THREAD GTKMM'
+            obj.includes = ['..']
+            obj.use    = ['libdvdomatic', 'libdvdomatic-gtk']
+            obj.source = '%s.cc' % t
+            obj.target = t

diff --git a/src/wscript b/src/wscript
new file mode 100644 (file)
index 0000000..9ae35d5
--- /dev/null
+++ b/src/wscript
@@ -0,0 +1,5 @@
+def build(bld):
+    bld.recurse('lib')
+    bld.recurse('tools')
+    if not bld.env.DISABLE_GUI:
+        bld.recurse('gtk')

diff --git a/test/dvd/VIDEO_TS/VIDEO_TS.BUP b/test/dvd/VIDEO_TS/VIDEO_TS.BUP
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/dvd/VIDEO_TS/VIDEO_TS.IFO b/test/dvd/VIDEO_TS/VIDEO_TS.IFO
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/dvd/VIDEO_TS/VIDEO_TS.VOB b/test/dvd/VIDEO_TS/VIDEO_TS.VOB
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/dvd/VIDEO_TS/VST_01_1.VOB b/test/dvd/VIDEO_TS/VST_01_1.VOB
new file mode 100644 (file)
index 0000000..190a180
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VST_01_1.VOB
@@ -0,0 +1 @@
+123

diff --git a/test/dvd/VIDEO_TS/VTS_01_0.IFO b/test/dvd/VIDEO_TS/VTS_01_0.IFO
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/dvd/VIDEO_TS/VTS_01_0.VOB b/test/dvd/VIDEO_TS/VTS_01_0.VOB
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/dvd/VIDEO_TS/VTS_01_1.VOB b/test/dvd/VIDEO_TS/VTS_01_1.VOB
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/test/dvd/VIDEO_TS/VTS_02_0.VOB b/test/dvd/VIDEO_TS/VTS_02_0.VOB
new file mode 100644 (file)
index 0000000..8d38505
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VTS_02_0.VOB
@@ -0,0 +1 @@
+456

diff --git a/test/dvd/VIDEO_TS/VTS_02_1.VOB b/test/dvd/VIDEO_TS/VTS_02_1.VOB
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VTS_02_1.VOB
@@ -0,0 +1 @@
+1

diff --git a/test/dvd/VIDEO_TS/VTS_02_2.VOB b/test/dvd/VIDEO_TS/VTS_02_2.VOB
new file mode 100644 (file)
index 0000000..48082f7
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VTS_02_2.VOB
@@ -0,0 +1 @@
+12

diff --git a/test/dvd/VIDEO_TS/VTS_02_3.VOB b/test/dvd/VIDEO_TS/VTS_02_3.VOB
new file mode 100644 (file)
index 0000000..190a180
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VTS_02_3.VOB
@@ -0,0 +1 @@
+123

diff --git a/test/dvd/VIDEO_TS/VTS_02_4.VOB b/test/dvd/VIDEO_TS/VTS_02_4.VOB
new file mode 100644 (file)
index 0000000..81c545e
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VTS_02_4.VOB
@@ -0,0 +1 @@
+1234

diff --git a/test/dvd/VIDEO_TS/VTS_03_0.IFO b/test/dvd/VIDEO_TS/VTS_03_0.IFO
new file mode 100644 (file)
index 0000000..e56e15b
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VTS_03_0.IFO
@@ -0,0 +1 @@
+12345

diff --git a/test/dvd/VIDEO_TS/VTS_03_0.VOB b/test/dvd/VIDEO_TS/VTS_03_0.VOB
new file mode 100644 (file)
index 0000000..e56e15b
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VTS_03_0.VOB
@@ -0,0 +1 @@
+12345

diff --git a/test/dvd/VIDEO_TS/VTS_03_1.VOB b/test/dvd/VIDEO_TS/VTS_03_1.VOB
new file mode 100644 (file)
index 0000000..9f358a4
--- /dev/null
+++ b/test/dvd/VIDEO_TS/VTS_03_1.VOB
@@ -0,0 +1 @@
+123456

diff --git a/test/film/log b/test/film/log
new file mode 100644 (file)
index 0000000..c887410
--- /dev/null
+++ b/test/film/log
@@ -0,0 +1,3 @@
+Fri Feb 17 18:54:32 2012: Starting to make a DCP on shankly
+Fri Feb 17 18:54:32 2012: Transcode job starting
+Fri Feb 17 18:54:37 2012: Transcode job completed successfully

diff --git a/test/film/metadata b/test/film/metadata
new file mode 100644 (file)
index 0000000..6c5afd6
--- /dev/null
+++ b/test/film/metadata
@@ -0,0 +1,18 @@
+name 
+content 
+dcp_long_name 
+guess_dcp_long_name 0
+frames_per_second 0
+left_crop 0
+right_crop 0
+top_crop 0
+bottom_crop 0
+scaler bicubic
+dcp_frames 0
+dcp_ab 0
+width 0
+height 0
+length 0
+audio_channels 0
+audio_sample_rate 0
+audio_sample_format Unknown

diff --git a/test/long.cc b/test/long.cc
new file mode 100644 (file)
index 0000000..6be1ef2
--- /dev/null
+++ b/test/long.cc
@@ -0,0 +1,156 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <fstream>
+#include <iostream>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include "format.h"
+#include "film.h"
+#include "filter.h"
+#include "job_manager.h"
+#include "util.h"
+#include "exceptions.h"
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE dvdomatic_test
+#include <boost/test/unit_test.hpp>
+
+using namespace std;
+using namespace boost;
+
+bool
+compare (string ref, string test, list<string> exclude)
+{
+       ifstream r (ref.c_str ());
+       ifstream t (test.c_str ());
+
+       while (r.good ()) {
+               string rl;
+               getline (r, rl);
+               string tl;
+               getline (t, tl);
+
+               bool ex = false;
+               for (list<string>::iterator i = exclude.begin(); i != exclude.end(); ++i) {
+                       if (rl.find (*i) != string::npos && tl.find (*i) != string::npos) {
+                               ex = true;
+                       }
+               }
+
+               if (!ex && rl != tl) {
+                       cerr << "Fail:\n" << rl << "\n" << tl << "\n";
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+
+BOOST_AUTO_TEST_CASE (make_dcp_test)
+{
+       dvdomatic_setup ();
+       
+       string const dcp_name = "FOO-BAR-BAZ";
+       
+       string const ref_film = "test/film";
+       string const ref_dcp = ref_film + "/" + dcp_name;
+       string const ref_pkl = ref_dcp + "/bdb4ae0a-0d09-4554-8557-0b4260f4c359_pkl.xml";
+       string const ref_cpl = ref_dcp + "/08dd6e45-83b5-41dc-9179-d7c59f597a12_cpl.xml";
+       string const test_film = "build/test/film";
+       string const test_dcp = test_film + "/" + dcp_name;
+       
+       if (boost::filesystem::exists (test_film)) {
+               boost::filesystem::remove_all (test_film);
+       }
+
+       Film f (test_film, false);
+       f.write_metadata ();
+       boost::filesystem::copy_file ("test/zombie.mpeg", "build/test/film/zombie.mpeg");
+       f.set_content ("zombie.mpeg");
+       f.set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+
+       BOOST_CHECK_EQUAL (f.audio_channels(), 2);
+       BOOST_CHECK_EQUAL (f.audio_sample_rate(), 48000);
+       BOOST_CHECK_EQUAL (audio_sample_format_to_string (f.audio_sample_format()), "S16");
+       
+       f.set_format (Format::from_nickname ("Flat"));
+
+       f.make_dcp (true, 5);
+
+       while (JobManager::instance()->work_to_do ()) {
+               sleep (1);
+       }
+
+       {
+               stringstream s;
+               s << "diff -ur test/film/j2c " << test_film << "/j2c";
+               int const r = ::system (s.str().c_str ());
+               BOOST_CHECK_EQUAL (r, 0);
+       }
+
+       {
+               stringstream s;
+               s << "diff -ur test/film/wavs " << test_film << "/wavs";
+               int const r = ::system (s.str().c_str ());
+               BOOST_CHECK_EQUAL (r, 0);
+       }
+
+       {
+               stringstream s;
+               s << "diff -u test/film/metadata " << test_film << "/metadata";
+               int const r = ::system (s.str().c_str ());
+               BOOST_CHECK_EQUAL (r, 0);
+       }
+
+       /* Find the test pkl and cpl */
+       string test_pkl;
+       string test_cpl;
+
+       for (filesystem::directory_iterator i = filesystem::directory_iterator (test_dcp); i != filesystem::directory_iterator(); ++i) {
+#if BOOST_FILESYSTEM_VERSION == 3              
+               string const t = filesystem::path(*i).generic_string ();
+#else
+               string const t = i->string ();
+#endif
+               if (algorithm::ends_with (t, "cpl.xml")) {
+                       test_cpl = t;
+               } else if (algorithm::ends_with (t, "pkl.xml")) {
+                       test_pkl = t;
+               }
+       }
+
+       {
+               list<string> exclude;
+               exclude.push_back ("urn:uuid");
+               exclude.push_back ("urn:uri");
+               exclude.push_back ("<IssueDate>");
+               exclude.push_back ("<LabelText>");
+               exclude.push_back ("<Hash>");
+               BOOST_CHECK_EQUAL (compare (ref_cpl, test_cpl, exclude), false);
+       }
+
+       {
+               list<string> exclude;
+               exclude.push_back ("urn:uuid");
+               exclude.push_back ("<IssueDate>");
+               exclude.push_back ("<Hash>");
+               BOOST_CHECK_EQUAL (compare (ref_pkl, test_pkl, exclude), false);
+       }
+}

diff --git a/test/metadata.ref b/test/metadata.ref
new file mode 100644 (file)
index 0000000..61b6df7
--- /dev/null
+++ b/test/metadata.ref
@@ -0,0 +1,24 @@
+name fred
+content 
+dcp_long_name sheila
+guess_dcp_long_name 0
+dcp_content_type Short
+frames_per_second 0
+format 185
+left_crop 1
+right_crop 2
+top_crop 3
+bottom_crop 4
+filter pphb
+filter unsharp
+scaler bicubic
+dcp_frames 42
+dcp_ab 1
+audio_gain 0
+audio_delay 0
+width 0
+height 0
+length 0
+audio_channels 0
+audio_sample_rate 0
+audio_sample_format Unknown

diff --git a/test/short.cc b/test/short.cc
new file mode 100644 (file)
index 0000000..3f01037
--- /dev/null
+++ b/test/short.cc
@@ -0,0 +1,220 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <fstream>
+#include <iostream>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include "format.h"
+#include "film.h"
+#include "filter.h"
+#include "job_manager.h"
+#include "util.h"
+#include "exceptions.h"
+#include "dvd.h"
+#include "delay_line.h"
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE dvdomatic_test
+#include <boost/test/unit_test.hpp>
+
+using namespace std;
+using namespace boost;
+
+BOOST_AUTO_TEST_CASE (film_metadata_test)
+{
+       dvdomatic_setup ();
+       
+       string const test_film = "build/test/film";
+       
+       if (boost::filesystem::exists (test_film)) {
+               boost::filesystem::remove_all (test_film);
+       }
+
+       BOOST_CHECK_THROW (new Film ("build/test/film", true), OpenFileError);
+       
+       Film f (test_film, false);
+       BOOST_CHECK (f.format() == 0);
+       BOOST_CHECK (f.dcp_content_type() == 0);
+       BOOST_CHECK (f.filters ().empty());
+
+       f.set_name ("fred");
+       BOOST_CHECK_THROW (f.set_content ("jim"), OpenFileError);
+       f.set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
+       f.set_format (Format::from_nickname ("Flat"));
+       f.set_left_crop (1);
+       f.set_right_crop (2);
+       f.set_top_crop (3);
+       f.set_bottom_crop (4);
+       vector<Filter const *> f_filters;
+       f_filters.push_back (Filter::from_id ("pphb"));
+       f_filters.push_back (Filter::from_id ("unsharp"));
+       f.set_filters (f_filters);
+       f.set_dcp_frames (42);
+       f.set_dcp_ab (true);
+       f.write_metadata ();
+
+       stringstream s;
+       s << "diff -u test/metadata.ref " << test_film << "/metadata";
+       BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0);
+
+       Film g (test_film, true);
+
+       BOOST_CHECK_EQUAL (g.name(), "fred");
+       BOOST_CHECK_EQUAL (g.dcp_content_type(), DCPContentType::from_pretty_name ("Short"));
+       BOOST_CHECK_EQUAL (g.format(), Format::from_nickname ("Flat"));
+       BOOST_CHECK_EQUAL (g.left_crop(), 1);
+       BOOST_CHECK_EQUAL (g.right_crop(), 2);
+       BOOST_CHECK_EQUAL (g.top_crop(), 3);
+       BOOST_CHECK_EQUAL (g.bottom_crop(), 4);
+       vector<Filter const *> g_filters = g.filters ();
+       BOOST_CHECK_EQUAL (g_filters.size(), 2);
+       BOOST_CHECK_EQUAL (g_filters.front(), Filter::from_id ("pphb"));
+       BOOST_CHECK_EQUAL (g_filters.back(), Filter::from_id ("unsharp"));
+       BOOST_CHECK_EQUAL (g.dcp_frames(), 42);
+       BOOST_CHECK_EQUAL (g.dcp_ab(), true);
+       
+       g.write_metadata ();
+       BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0);
+}
+
+BOOST_AUTO_TEST_CASE (format_test)
+{
+       Format::setup_formats ();
+       
+       Format const * f = Format::from_nickname ("Flat");
+       BOOST_CHECK (f);
+       BOOST_CHECK_EQUAL (f->ratio_as_integer(), 185);
+       
+       f = Format::from_nickname ("Scope");
+       BOOST_CHECK (f);
+       BOOST_CHECK_EQUAL (f->ratio_as_integer(), 239);
+}
+
+BOOST_AUTO_TEST_CASE (util_test)
+{
+       string t = "Hello this is a string \"with quotes\" and indeed without them";
+       vector<string> b = split_at_spaces_considering_quotes (t);
+       vector<string>::iterator i = b.begin ();
+       BOOST_CHECK_EQUAL (*i++, "Hello");
+       BOOST_CHECK_EQUAL (*i++, "this");
+       BOOST_CHECK_EQUAL (*i++, "is");
+       BOOST_CHECK_EQUAL (*i++, "a");
+       BOOST_CHECK_EQUAL (*i++, "string");
+       BOOST_CHECK_EQUAL (*i++, "with quotes");
+       BOOST_CHECK_EQUAL (*i++, "and");
+       BOOST_CHECK_EQUAL (*i++, "indeed");
+       BOOST_CHECK_EQUAL (*i++, "without");
+       BOOST_CHECK_EQUAL (*i++, "them");
+}
+
+BOOST_AUTO_TEST_CASE (dvd_test)
+{
+       vector<uint64_t> const t = dvd_titles ("test/dvd");
+       BOOST_CHECK_EQUAL (t.size(), 4);
+       BOOST_CHECK_EQUAL (t[1], 0);
+       BOOST_CHECK_EQUAL (t[2], 14);
+       BOOST_CHECK_EQUAL (t[3], 7);
+}
+
+void
+do_positive_delay_line_test (int delay_length, int block_length)
+{
+       DelayLine d (delay_length);
+       uint8_t data[block_length];
+
+       int in = 0;
+       int out = 0;
+       int returned = 0;
+       int zeros = 0;
+       
+       for (int i = 0; i < 64; ++i) {
+               for (int j = 0; j < block_length; ++j) {
+                       data[j] = in;
+                       ++in;
+               }
+
+               int const a = d.feed (data, block_length);
+               returned += a;
+
+               for (int j = 0; j < a; ++j) {
+                       if (zeros < delay_length) {
+                               BOOST_CHECK_EQUAL (data[j], 0);
+                               ++zeros;
+                       } else {
+                               BOOST_CHECK_EQUAL (data[j], out & 0xff);
+                               ++out;
+                       }
+               }
+       }
+
+       BOOST_CHECK_EQUAL (returned, 64 * block_length);
+}
+
+void
+do_negative_delay_line_test (int delay_length, int block_length)
+{
+       DelayLine d (delay_length);
+       uint8_t data[block_length];
+
+       int in = 0;
+       int out = -delay_length;
+       int returned = 0;
+       
+       for (int i = 0; i < 256; ++i) {
+               for (int j = 0; j < block_length; ++j) {
+                       data[j] = in;
+                       ++in;
+               }
+
+               int const a = d.feed (data, block_length);
+               returned += a;
+
+               for (int j = 0; j < a; ++j) {
+                       BOOST_CHECK_EQUAL (data[j], out & 0xff);
+                       ++out;
+               }
+       }
+
+       uint8_t remainder[-delay_length];
+       d.get_remaining (remainder);
+       returned += -delay_length;
+
+       for (int i = 0; i < -delay_length; ++i) {
+               BOOST_CHECK_EQUAL (remainder[i], 0);
+               ++out;
+       }
+
+       BOOST_CHECK_EQUAL (returned, 256 * block_length);
+       
+}
+
+BOOST_AUTO_TEST_CASE (delay_line_test)
+{
+       do_positive_delay_line_test (64, 128);
+       do_positive_delay_line_test (128, 64);
+       do_positive_delay_line_test (3, 512);
+       do_positive_delay_line_test (512, 3);
+
+       do_positive_delay_line_test (0, 64);
+
+       do_negative_delay_line_test (-64, 128);
+       do_negative_delay_line_test (-128, 64);
+       do_negative_delay_line_test (-3, 512);
+       do_negative_delay_line_test (-512, 3);
+}

diff --git a/test/wscript b/test/wscript
new file mode 100644 (file)
index 0000000..7ea02a8
--- /dev/null
+++ b/test/wscript
@@ -0,0 +1,16 @@
+def build(bld):
+    obj = bld(features = 'cxx cxxprogram')
+    obj.name   = 'short-unit-tests'
+    obj.uselib = 'BOOST_TEST'
+    obj.use    = 'libdvdomatic'
+    obj.source = 'short.cc'
+    obj.target = 'short-unit-tests'
+    obj.install_path = ''
+
+    obj = bld(features = 'cxx cxxprogram')
+    obj.name   = 'long-unit-tests'
+    obj.uselib = 'BOOST_TEST'
+    obj.use    = 'libdvdomatic'
+    obj.source = 'long.cc'
+    obj.target = 'long-unit-tests'
+    obj.install_path = ''

diff --git a/waf b/waf
new file mode 100755 (executable)
index 0000000..178461f
Binary files /dev/null and b/waf differ

diff --git a/wscript b/wscript
new file mode 100644 (file)
index 0000000..98fa0f6
--- /dev/null
+++ b/wscript
@@ -0,0 +1,91 @@
+APPNAME = 'dvdomatic'
+VERSION = '0.26pre'
+
+def options(opt):
+    opt.load('compiler_cxx')
+    opt.add_option('--debug-hash', action='store_true', default = False, help = 'print hashes of data at various points')
+    opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation')
+    opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools')
+
+def configure(conf):
+    conf.load('compiler_cxx')
+
+    conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-Wall'])
+    conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_VERSION="%s"' % VERSION])
+
+    conf.env.DEBUG_HASH = conf.options.debug_hash
+    if conf.options.debug_hash:
+        conf.env.append_value('CXXFLAGS', '-DDEBUG_HASH')
+        conf.check_cc(msg = 'Checking for library libmhash', function_name = 'mhash_init', header_name = 'mhash.h', lib = 'mhash', uselib_store = 'MHASH')
+
+    if conf.options.enable_debug:
+        conf.env.append_value('CXXFLAGS', '-g')
+    else:
+        conf.env.append_value('CXXFLAGS', '-O3')
+
+    conf.env.DISABLE_GUI = conf.options.disable_gui
+    if conf.options.disable_gui is False:
+        conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
+        conf.check_cfg(package = 'gtkmm-2.4', args = '--cflags --libs', uselib_store = 'GTKMM', mandatory = True)
+        conf.check_cfg(package = 'cairomm-1.0', args = '--cflags --libs', uselib_store = 'CAIROMM', mandatory = True)
+
+    conf.check_cfg(package = 'sigc++-2.0', args = '--cflags --libs', uselib_store = 'SIGC++', mandatory = True)
+    conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
+    conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
+    conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
+    conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True)
+    conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True)
+    conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = True)
+    conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
+    conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
+    conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)
+    conf.check_cc(msg = 'Checking for library libtiff', function_name = 'TIFFOpen', header_name = 'tiffio.h', lib = 'tiff', uselib_store = 'TIFF')
+    conf.check_cc(fragment  = """
+                             #include <stdio.h>\n
+                             #include <openjpeg.h>\n
+                             int main () {\n
+                             void* p = (void *) opj_image_create;\n
+                             return 0;\n
+                             }
+                             """, msg = 'Checking for library openjpeg', lib = 'openjpeg', uselib_store = 'OPENJPEG')
+
+    conf.check_cc(fragment  = """
+                              #include <libssh/libssh.h>\n
+                              int main () {\n
+                              ssh_session s = ssh_new ();\n
+                              return 0;\n
+                              }
+                              """, msg = 'Checking for library libssh', lib = 'ssh', uselib_store = 'SSH')
+                             
+    conf.check_cxx(fragment = """
+                             #include <boost/thread.hpp>\n
+                             int main() { boost::thread t (); }\n
+                             """, msg = 'Checking for boost threading library', lib = 'boost_thread', uselib_store = 'BOOST_THREAD')
+    conf.check_cxx(fragment = """
+                             #include <boost/filesystem.hpp>\n
+                             int main() { boost::filesystem::copy_file ("a", "b"); }\n
+                             """, msg = 'Checking for boost filesystem library', libpath = '/usr/local/lib', lib = ['boost_filesystem', 'boost_system'], uselib_store = 'BOOST_FILESYSTEM')
+    conf.check_cxx(fragment = """
+                              #define BOOST_TEST_MODULE Config test\n
+                             #include <boost/test/unit_test.hpp>\n
+                              int main() {}
+                              """, msg = 'Checking for boost unit testing library', lib = 'boost_unit_test_framework', uselib_store = 'BOOST_TEST')
+
+def build(bld):
+    bld.recurse('src')
+    bld.recurse('test')
+
+    d = { 'PREFIX' : '${PREFIX' }
+
+    obj = bld(features = 'subst')
+    obj.source = 'dvdomatic.desktop.in'
+    obj.target = 'dvdomatic.desktop'
+    obj.dict = d
+
+    bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop')
+    for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
+        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
+
+
+def dist(ctx):
+    ctx.excl = 'TODO core *~ src/gtk/*~ src/lib/*~ .waf* build'