diff --git a/fonts/FreeMono.otf b/fonts/FreeMono.otf deleted file mode 100644 index dc646b1..0000000 Binary files a/fonts/FreeMono.otf and /dev/null differ diff --git a/fonts/FreeMonoBold.otf b/fonts/FreeMonoBold.otf deleted file mode 100644 index 247d972..0000000 Binary files a/fonts/FreeMonoBold.otf and /dev/null differ diff --git a/fonts/FreeMonoBoldOblique.otf b/fonts/FreeMonoBoldOblique.otf deleted file mode 100644 index 6174f38..0000000 Binary files a/fonts/FreeMonoBoldOblique.otf and /dev/null differ diff --git a/fonts/FreeMonoOblique.otf b/fonts/FreeMonoOblique.otf deleted file mode 100644 index 8b6d30f..0000000 Binary files a/fonts/FreeMonoOblique.otf and /dev/null differ diff --git a/fonts/FreeSans.otf b/fonts/FreeSans.otf deleted file mode 100644 index 062c939..0000000 Binary files a/fonts/FreeSans.otf and /dev/null differ diff --git a/fonts/FreeSansBold.otf b/fonts/FreeSansBold.otf deleted file mode 100644 index 3ddde16..0000000 Binary files a/fonts/FreeSansBold.otf and /dev/null differ diff --git a/fonts/FreeSansBoldOblique.otf b/fonts/FreeSansBoldOblique.otf deleted file mode 100644 index 9a1c0a1..0000000 Binary files a/fonts/FreeSansBoldOblique.otf and /dev/null differ diff --git a/fonts/FreeSansOblique.otf b/fonts/FreeSansOblique.otf deleted file mode 100644 index f22e9ae..0000000 Binary files a/fonts/FreeSansOblique.otf and /dev/null differ diff --git a/fonts/FreeSerif.otf b/fonts/FreeSerif.otf deleted file mode 100644 index 04a8d84..0000000 Binary files a/fonts/FreeSerif.otf and /dev/null differ diff --git a/fonts/FreeSerifBold.otf b/fonts/FreeSerifBold.otf deleted file mode 100644 index 681e87e..0000000 Binary files a/fonts/FreeSerifBold.otf and /dev/null differ diff --git a/fonts/FreeSerifBoldItalic.otf b/fonts/FreeSerifBoldItalic.otf deleted file mode 100644 index c89cd55..0000000 Binary files a/fonts/FreeSerifBoldItalic.otf and /dev/null differ diff --git a/fonts/FreeSerifItalic.otf b/fonts/FreeSerifItalic.otf deleted file mode 100644 index 5ead075..0000000 Binary files a/fonts/FreeSerifItalic.otf and /dev/null differ diff --git a/gpl.txt b/gpl.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/gpl.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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 +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program 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, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU 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 Lesser General +Public License instead of this License. But first, please read +. diff --git a/images-src/logo-banner.svg b/images-src/logo-banner.svg index 93db8d8..972f8fe 100644 --- a/images-src/logo-banner.svg +++ b/images-src/logo-banner.svg @@ -11,53 +11,24 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="625.59436" - height="174.97264" + width="610.63" + height="175" id="svg7147" version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="logo-banner.svg"> - - - - + - - - - - - - @@ -74,41 +45,6 @@ offset="0" id="stop8044" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="radialGradient4637" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.9027442,0.00279092,-0.00215062,-2.2367949,922.21126,1597.1395)" + cx="234.16197" + cy="496.15369" + fx="234.16197" + fy="496.15369" + r="17.83889" /> + + + + + + + + + + + + + + image/svg+xml - + - + transform="translate(-53.605095,-154.26797)"> - - - - - - - - - - - - - - - + inkscape:connector-curvature="0" /> + transform="translate(-53.605095,-154.26797)"> + transform="matrix(0.69499782,0,0,0.69499782,39.596588,63.364342)"> @@ -1076,13 +543,13 @@ transform="matrix(2.2605684,0,0,2.2605684,-330.73585,-1758.8125)" id="g5838-2-6"> @@ -1091,117 +558,39 @@ transform="matrix(2.1425073,-0.72099367,0.72099367,2.1425073,-381.69568,302.73897)" id="g5815-9-0"> - + transform="translate(-14.687302,-5.8122043)"> - She - + + + + + Bang - + + + + + + Lambda - - - The technical musingsof a minimalist - - The technical musingsof a minimalist - - The technical musings of a minimalist - - The technical musingsof a minimalist + transform="translate(4,0)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="g5167" + transform="translate(1.2021189,-0.34346255)"> + sodipodi:type="arc" + transform="matrix(0.85386738,0,0,0.85386738,236.20006,107.58586)" /> + sodipodi:type="star" + transform="matrix(0.71054532,0,0,0.71054532,222.03016,-10.567653)" /> + transform="translate(-3.0811598,16.24533)"> + transform="matrix(0.90815159,0,0,0.90815159,12.001178,-1.7255386)"> @@ -1422,18 +912,14 @@ id="g9789-3" style="display:inline"> @@ -1445,20 +931,16 @@ transform="translate(-189.67476,119.10856)" id="g8048"> @@ -1467,210 +949,18 @@ style="display:inline" transform="matrix(0.96424815,-0.03663261,0.03663261,0.96424815,-10.120789,6.7932157)"> - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/logo-banner.svg b/images/logo-banner.svg index 3be9544..8cdfe14 100644 --- a/images/logo-banner.svg +++ b/images/logo-banner.svg @@ -9,49 +9,19 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" - width="625.59436" - height="174.97264" + width="610.63" + height="175" id="svg7147"> - - - - + - - - - - - - - - - - - - - - - - - - - - @@ -282,137 +200,6 @@ id="feGaussianBlur9783-6-2" stdDeviation="0.63961816" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -800,200 +388,113 @@ - + style="fill:url(#linearGradient4711);fill-opacity:1;stroke:url(#radialGradient4713);stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> - - - + style="opacity:0.85912871;fill:url(#pattern3474);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /> - - - - - - - - - - - + style="fill:url(#radialGradient4637);fill-opacity:1;stroke:none" /> + style="fill:#000000;fill-opacity:1;stroke:url(#linearGradient4654);stroke-width:1.48435366;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;fill-opacity:1;stroke:url(#linearGradient4659);stroke-width:1.48435366;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;fill-opacity:1;stroke:url(#linearGradient4664);stroke-width:1.48435366;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;fill-opacity:1;stroke:url(#linearGradient4669);stroke-width:1.48435366;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;stroke:url(#linearGradient4674);stroke-width:1.48435366;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;stroke:url(#linearGradient4679);stroke-width:1.48435366;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4684);stroke-width:1.48435378;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4689);stroke-width:1.48435378;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4694);stroke-width:1.48435378;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4699);stroke-width:1.48435378;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4704);stroke-width:1.48435378;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> - - She - + + + + + Bang - + + + + + + Lambda - - - The technical musingsof a minimalist - - The technical musingsof a minimalist - + + + + + + + + - The technical musings of a minimalist - - The technical musingsof a minimalist + style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1138,22 +715,22 @@ @@ -1163,12 +740,12 @@ id="g9789-3" style="display:inline"> + style="fill:url(#radialGradient4644);fill-opacity:1;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;filter:url(#filter9785-4)" /> @@ -1180,12 +757,12 @@ transform="translate(-189.67476,119.10856)" id="g8048"> @@ -1196,160 +773,16 @@ id="g7989-8" style="display:inline"> - - - - - - - - - - - - - - - - - - - - - - diff --git a/js/default.js b/js/default.js index 39fb78a..2b5fa8c 100644 --- a/js/default.js +++ b/js/default.js @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . -*/ + */ /** * File:. default.js @@ -24,116 +24,125 @@ //------------------------ -function newContentCallback() { - $('#page-content a').click(function (evt) { - var page_href = $(this).attr('href'); - var external_url_regexp = /https?:\/\/.*/; +(function () { + var page = (function () { + var pageId = '#page-content', navId = '#nav'; - if (external_url_regexp.test(page_href)) { - window.location.href = page_href; - } else { - evt.preventDefault(); - $.address.value(page_href); + function init() { + $(document).ready(function () { + $.address.init(function(event) { + console.log("init:" + event.value); + $(window).load(function () { + loadPageContent(event.value); + }); + }); + + $('#nav-menu a.menuitem').click(function() { + $(this).closest('ul').find('li.active').removeClass('active'); + $(this).closest('li').addClass('active'); + //$('.navbar-collapse').collapse('hide'); + }); + + // Callback for when the inital page has completely loaded (including images, etc..) + $(window).load(function () { + $.address.change(function(event) { + console.log("change " + event.value); + loadPageContent(event.value); + }); + }); + }); } - }); - $('#page-content a').click(function() { - scrollTo('#nav', 'fast'); - }); -} + function newContentCallback() { + $('#page-content a').click(function (evt) { + var page_href = $(this).attr('href'); + var external_url_regexp = /https?:\/\/.*/; -function loadPageContent(page_href) { - var post_regexp = /posts\/.*/; - var tag_regexp = /tags\/.*/; + if (external_url_regexp.test(page_href)) { + window.location.href = page_href; + } else { + evt.preventDefault(); + $.address.value(page_href); + } + }); + } - // Check whether the requested url is a post; otherwise assume its a page - if (post_regexp.test(page_href)) { - // Handle post urls (no change required to page_href) - $('#nav-menu li.active').removeClass('active'); - $('#nav-menu li a[href="./pages/blog.html"]').parent('li').addClass('active'); - } else if (tag_regexp.test(page_href)) { - // Handle tag pages - $('#nav-menu li.active').removeClass('active'); - $('#nav-menu li a[href="./pages/blog.html"]').parent('li').addClass('active'); - } else { - // Check if the page_href is empty or / and if so goto home - if (page_href == '/' || page_href == '') { - page_href = '/home.html'; - } - - // Initially set the active menuitem in the nav - $('a.menuitem[rel="address:' + page_href + '"]').closest('ul').find('li.active').removeClass('active'); - $('a.menuitem[rel="address:' + page_href + '"]').closest('li').addClass('active'); + function loadPageContent(page_href) { + var post_regexp = /posts\/.*/; + var tag_regexp = /tags\/.*/; - // set page_href of full url for ajax call - page_href = "pages" + page_href; - } + // Check whether the requested url is a post; otherwise assume its a page + if (post_regexp.test(page_href)) { + // Handle post urls (no change required to page_href) + $('#nav-menu li.active').removeClass('active'); + $('#nav-menu li a[href="./pages/blog.html"]').parent('li').addClass('active'); + } else if (tag_regexp.test(page_href)) { + // Handle tag pages + $('#nav-menu li.active').removeClass('active'); + $('#nav-menu li a[href="./pages/blog.html"]').parent('li').addClass('active'); + } else { + // Check if the page_href is empty or / and if so goto home + if (page_href === '/' || page_href === '') { + page_href = '/home.html'; + } - // Make the ajax request for the new page-content (whether it be a page or a post) *could change* - $.ajax({ - url: page_href, - type: 'GET', - dataType: 'html', - beforeSend: function (xhr, settings) { - // Add .loading to #page-content and #nav to facilitate a loading animation - $('#page-content, #nav').addClass('loading'); + // Initially set the active menuitem in the nav + $('a.menuitem[rel="address:' + page_href + '"]').closest('ul').find('li.active').removeClass('active'); + $('a.menuitem[rel="address:' + page_href + '"]').closest('li').addClass('active'); - console.log('beforeSend a.menuitem'); - }, - success: function (dta) { - // Remove the loading gif - $('#page-content').removeClass('init'); + // set page_href of full url for ajax call + page_href = "pages" + page_href; + } - // Replace old page-content with new page-content - $('#page-content').replaceWith(dta); + // Make the ajax request for the new page-content (whether it be a page or a post) *could change* + $.ajax({ + url: page_href, + type: 'GET', + dataType: 'html', + beforeSend: function (xhr, settings) { + // Add .loading to #page-content and #nav to facilitate a loading animation + $('#page-content, #nav').removeClass('loading-done').addClass('loading'); - // Stop loading animations in the nav and page-content-wrap - $('#page-content, #nav').removeClass('loading'); + console.log('beforeSend a.menuitem'); + }, + success: function (dta) { + // Remove the initial loading gif (if its there) + $('#page-content').removeClass('init'); - // Add new content callbacks - newContentCallback(); - }, - error: function (xhr, status) { - /* Remove .loading then add .loading-error to #page-content and #nav to - * stop the loading animation and facilitate a loading error animation - */ - $('#page-content, #nav').removeClass('loading').addClass('loading-error'); - - console.log('error retrieving page "' + page_href +'": ' + status); - } - }); -} + // Stop animations in the nav and page-content and scroll to the top of the page in a set amount of time + setTimeout(function () { + // Replace old page-content with new page-content + $('#page-content').html(dta); -// Scroll to the top of a given element in a specified amount of time -function scrollTo(elem, dur) { - $('html, body').animate({ - scrollTop: $(elem).offset().top - }, dur); -} + $('#page-content, #nav').removeClass('loading'); -$(document).ready(function () { - $.address.init(function(event) { - console.log("init:" + event.value); - $(window).load(function () { - loadPageContent(event.value); - }); - }); - - $('#nav-menu a.menuitem').click(function() { - $(this).closest('ul').find('li.active').removeClass('active'); - $(this).closest('li').addClass('active'); - //$('.navbar-collapse').collapse('hide'); - }); + if ($('body').scrollTop() > $('#nav').offset().top - 15) { + $('html, body').animate({ + scrollTop: $('#nav').offset().top - 15 + }, 'fast'); + } - // $('a.internal').click(function(evt) { - // $.address.value($(this).attr('href')); - // }); + // Add new content callbacks + newContentCallback(); + }, 250); + }, + error: function (xhr, status) { + /* Remove .loading then add .loading-error to #page-content and #nav to + * stop the loading animation and facilitate a loading error animation + */ + $('#page-content, #nav').removeClass('loading').addClass('loading-error'); - // Callback for when the inital page has completely loaded (including images, etc..) - $(window).load(function () { - $.address.change(function(event) { - console.log("change " + event.value); - loadPageContent(event.value); - }); - }); -}); + console.log('error retrieving page "' + page_href +'": ' + status); + } + }); + } + + return { + init: init, + newContentCallback: newContentCallback, + loadPageContent: loadPageContent + }; + }()); + + page.init(); +}()); diff --git a/lib/JQuery/jquery-1.9.1.js b/lib-src/JQuery/jquery-1.9.1.js similarity index 100% rename from lib/JQuery/jquery-1.9.1.js rename to lib-src/JQuery/jquery-1.9.1.js diff --git a/lib-src/Skeleton b/lib-src/Skeleton new file mode 160000 index 0000000..2d9549b --- /dev/null +++ b/lib-src/Skeleton @@ -0,0 +1 @@ +Subproject commit 2d9549b34384269d5de9750db12c7338db020746 diff --git a/jquery-address b/lib-src/jquery-address similarity index 100% rename from jquery-address rename to lib-src/jquery-address diff --git a/lib/Skeleton b/lib/Skeleton deleted file mode 160000 index 7ab6820..0000000 --- a/lib/Skeleton +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ab682091d1032035cfcb668e6bd4b465bfa4679 diff --git a/lib/jquery-address b/lib/jquery-address deleted file mode 160000 index bb6103f..0000000 --- a/lib/jquery-address +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bb6103f9021fee0bf275e2b9dae31082c683ac94 diff --git a/pages/contact.markdown b/pages/contact.markdown index 22dad27..cb05dd6 100644 --- a/pages/contact.markdown +++ b/pages/contact.markdown @@ -5,4 +5,8 @@ date: 2013-10-12 weight: 3 --- -This is a little explanation about me as well as some contact information. +My main interests include computers and mathematics. I am well versed in operating and maintaining Linux servers, including web technologies like Apache, PHP, MYSQL, SSH, NFS and SAMBA. I also have experience with FreeBSD servers as i run one at home. In addition I run a few of my own personal Linux servers as well that use a variety of technologies i have stated above as well as security technologies including tripwire, iptables, AppArmour, SELinux, dm-crypt, gpg and others. + +I have many tangible skills in the fields of computer science, mathematics and general technology . I enjoy programming and can apply a variety of languages to do the task at hand including Bash Shell, C, C++, Java, C#, Racket, Scheme, Haskell and Python. To me the language used is just another tool and i consider myself versatile enough to learn new programming languages due to the variety i already know. I have a great passion for computer science specifically in the subtopics of compilers, language design, networking, the relation of mathematics and computational evaluation, functional programming, and programming paradigms. + +My great interest and capabilities earned me acknowledgement by Sun Microsystems Netbeans project at age 15. Outside of technology i like to engaged in physically related interests such as (but not limited to) long-boarding, snowboarding, as well as playing a variety of recreational sports including hockey, football, soccer and tennis. diff --git a/pages/home.markdown b/pages/home.markdown index f61e23d..711062d 100644 --- a/pages/home.markdown +++ b/pages/home.markdown @@ -34,6 +34,47 @@ This website was proudly made with open source software! Specifically: - [Gnu Free Fonts][] $endsection$ +$section("license")$ +Terms of Use +============ +------------ + +This site is _Copyright 2013 © - Collin Doering_ and is distributed under the following terms. + +1. All rights reserved on the "#! λ Slang" name, as well as on the + [banner image](/images/logo-banner.svg), favicons~[1](/images/favicon.ico), + [2](/images/favicon.png)~ and any other image/artwork that embodies the likeness of "#! λ + Slang" +2. Not withstanding (1), all images and artwork are licensed under the + [Creative Commons BY-NC-ND License][] +3. Unless otherwise noted, all "_content_" on [#! λ Slang](/) is licenced under the + [Creative Commons BY-NC-SA License][] +4. Any "_content_" "_delimited as source-code_" is licensed under the [GPLv3][] unless otherwise + specified +5. Not withstanding (1), (2), or (3), the [Hakyll][] configuration and all files required to + build this site are available under the [GPLv3][], [here](/) + +Definitions +----------- + +1. "_Content_" is any html accesible from [#! λ Slang](/), as well as all the "_markdown sources_" used to produces said html. +2. "_Markdown sources_" refers to all files that are written in the + [Markdown Language](http://daringfireball.net/projects/markdown/) including those + that use [Pandoc Extensions](http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown) +3. Content is "_delimited as source-code_" when the item (text) in question is: + 1. Contained within a html element with class sourceCode (html) + 2. Contained within a code block (markdown) or fenced code block (pandoc markdown extension) + +See More +-------- + +For more information see: + +- [GPLv3][] +- [Creative Commons Licence BY-NS-SA][] +- [Creative Commons BY-NC-ND License][] +$endsection$ + $section$ [Hakyll]: http://jaspervdj.be/hakyll/ [Skeleton]: http://www.getskeleton.com/ @@ -46,4 +87,8 @@ $section$ [Gimp]: http://www.gimp.org/ [Gnu Emacs]: http://www.gnu.org/software/emacs/ [Gnu Free Fonts]: http://www.gnu.org/software/freefont/ + +[GPLv3]: https://www.gnu.org/licenses/gpl.html +[Creative Commons Licence BY-NS-SA]: http://creativecommons.org/licenses/by-nc-sa/4.0/ +[Creative Commons BY-NC-ND License]: http://creativecommons.org/licenses/by-nc-nd/4.0/ $endsection$ diff --git a/post-offline.html b/post-offline.html new file mode 100644 index 0000000..097a04f --- /dev/null +++ b/post-offline.html @@ -0,0 +1,9 @@ + + + + +
+

You are currently offline and this post is unaccesable

+
+ + diff --git a/posts/first-post.markdown b/posts/first-post.markdown new file mode 100644 index 0000000..e80d708 --- /dev/null +++ b/posts/first-post.markdown @@ -0,0 +1,21 @@ +--- +title: First Post on my Hakyll powered blog +author: Collin J. Doering +date: 2014-03-01 +description: First bost on newly deployed Hakyll powered blog +updated: 2013-03-01 +tags: general +--- + +Hi all! Thanks for taking the time to visit my new blog. The terms of use of the content and +source code for the blog are on the [homepage](/). This site is still under light construction, +if you notice any issues please take the time to let me know via +[email](email/collin.doering@gmail.com). + +The purpose of this blog is to allow me to 'put my thoughts to paper' so to speak. I hope you +will find at least some of my exploits entertaining, as I will discuss varying topics of +personal interest including computers, linux, programming, math among other. In an upcoming +post i will detail how i built this Hakyll powered blog. Though as i mentioned earlier there +are still a few little touch ups to be completed before everything is to my satisfaction; +particularily, i haven't got pagination to work yet. Anyways, once i have it working i will +write a post detailing how i setup this blog. For now, that's all; thanks for reading! diff --git a/posts/math.markdown b/posts/math.markdown index d931eb7..43e6622 100644 --- a/posts/math.markdown +++ b/posts/math.markdown @@ -3,6 +3,7 @@ title: Math author: Collin J. Doering date: 2013-12-08 description: An Article about math +updated: 2013-12-08 tags: math --- Exceeding reaction chamber thermal limit. We have begun power-supply calibration. Force fields have been established on all turbo lifts and crawlways. Computer, run a level-two diagnostic on warp-drive systems. Antimatter containment positive. Warp drive within normal parameters. I read an ion trail characteristic of a freighter escape pod. The bomb had a molecular-decay detonator. Detecting some unusual fluctuations in subspace frequencies. diff --git a/sass/_blog-page.sass b/sass/_blog-page.sass index 103f700..393f9c9 100644 --- a/sass/_blog-page.sass +++ b/sass/_blog-page.sass @@ -58,9 +58,8 @@ font-style: oblique footer - margin-bottom: 1em - hr - margin-bottom: 1em + padding: 0.75em 0 0.25em 0 + border-top: 1px solid #eee .read-more font-weight: bold diff --git a/sass/_fonts.sass b/sass/_fonts.sass index e91c864..d0ce01c 100644 --- a/sass/_fonts.sass +++ b/sass/_fonts.sass @@ -18,23 +18,22 @@ // Date: Dec 10, 2013 // Description: Define all font-faces and related things -@mixin custom-font($name, $weight, $style) - font-family: $name - src: url('/fonts/' + $name + '.ttf') format('truetype'), url('/fonts/' + $name + '.woff') format('woff'), url('/fonts/' + $name + '.otf') format('opentype') - font-weight: $weight - font-style: $style +// @mixin custom-font($name, $weight, $style) +// font-family: $name +// src: url('/fonts/' + $name + '.ttf') format('truetype'), url('/fonts/' + $name + '.woff') format('woff'), url('/fonts/' + $name + '.otf') format('opentype') +// font-weight: $weight +// font-style: $style -// Eventually switch to this instead of my custom mixin above -// @include font-face(FreeMono, '/fonts/FreeMono') -// @include font-face(FreeMono, '/fonts/FreeMonoBold', bold) -// @include font-face(FreeMono, '/fonts/FreeMonoOblique', normal, oblique) -// @include font-face(FreeMono, '/fonts/FreeMonoBoldOblique', bold, oblique) +@include font-face(FreeMono, '/fonts/FreeMono') +@include font-face(FreeMono, '/fonts/FreeMonoBold', bold) +@include font-face(FreeMono, '/fonts/FreeMonoOblique', normal, oblique) +@include font-face(FreeMono, '/fonts/FreeMonoBoldOblique', bold, oblique) -@font-face - @include custom-font(FreeMono, normal, normal) -@font-face - @include custom-font(FreeMonoBold, bold, normal) -@font-face - @include custom-font(FreeMonoOblique, normal, oblique) -@font-face - @include custom-font(FreeMonoBoldOblique, bold, oblique) +// @font-face +// @include custom-font(FreeMono, normal, normal) +// @font-face +// @include custom-font(FreeMonoBold, bold, normal) +// @font-face +// @include custom-font(FreeMonoOblique, normal, oblique) +// @font-face +// @include custom-font(FreeMonoBoldOblique, bold, oblique) diff --git a/sass/_header.sass b/sass/_header.sass index 5cf7159..2a35295 100644 --- a/sass/_header.sass +++ b/sass/_header.sass @@ -38,7 +38,6 @@ #nav border: 2px solid border-width: 2px 0 2px 0 - margin-bottom: 1em background: url('/images/diagonal-stripes.png') @include animation(nav-slide 5s linear infinite) @include animation-play-state(paused) diff --git a/sass/_home-page.sass b/sass/_home-page.sass index 439035a..2824286 100644 --- a/sass/_home-page.sass +++ b/sass/_home-page.sass @@ -21,7 +21,7 @@ border: 2px solid border-radius: 5px padding: 10px - margin-bottom: 10px +// margin-bottom: 10px #recent-posts // style recent posts section diff --git a/sass/_post-page.sass b/sass/_post-page.sass new file mode 100644 index 0000000..690cf16 --- /dev/null +++ b/sass/_post-page.sass @@ -0,0 +1,24 @@ +// (C) Copyright Collin Doering 2013 +// +// 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 . + +// File: _post-page.sass +// Author: Collin J. Doering +// Date: Dec 12, 2013 + +#post-page + .post + footer + padding-top: 0 + border-top: 0 diff --git a/sass/default.sass b/sass/default.sass index 7c922b2..185d4d7 100644 --- a/sass/default.sass +++ b/sass/default.sass @@ -16,7 +16,7 @@ // File: default.sass // Author: Collin J. Doering // Date: Dec 5, 2013 - +// // Use Bourbon @import 'sass/bourbon/bourbon' @@ -28,28 +28,53 @@ @import 'sass/blog-page' @import 'sass/contact-page' @import 'sass/tag-page' - +@import 'sass/post-page' @import 'sass/src-highlight' //------------------------------------------------------------------------------------- // General //------------------------------------------------------------------------------------- +* + -webkit-backface-visibility: hidden + body background: #efe font: 14px/21px FreeMono, monospace, Helvetica, Arial, sans-serif - -webkit-text-stroke: 0.3px h1,h2,h3,h4,h5,h6 font-family: FreeMono +h1 + font-size: 2.5em +h2 + font-size: 2em +h3 + font-size: 1.75em +h4 + font-size: 1.5em +h5 + font-size: 1.25em +h6 + font-size: 1em + +ul, ol + padding-left: 1em + +hr + margin-bottom: 0.5em + +#noscript-alert + @include border-box(0, #FCD4D4) + text-align: center #page-content opacity: 1 - @include transition(opacity 400ms) + @include transition(opacity 250ms ease-out) + margin-top: 1em overflow: hidden ul > li:before - content: "\2192 " - padding-right: 1em + content: "\2192" + padding-right: 0.5em font-size: 1.5em ul > li @@ -58,16 +83,19 @@ h1,h2,h3,h4,h5,h6 margin-bottom: 0.02em #page-content.loading - opacity: 0.45 + opacity: 0.35 -#page-content.init.loading - background: url('/images/init-loading.gif') no-repeat 50% - height: 100px - padding: 1.5em 0 +#page-content.loading-done + @include transition(opacity 1s ease-in 0.5s) + opacity: 1 #page-content.loading-error // do something +#page-content.init.loading + background: url('/images/init-loading.gif') no-repeat 50% + height: 125px + #page-content.init.loading-error // do something @@ -77,7 +105,7 @@ h1,h2,h3,h4,h5,h6 #footer-right text-align: right -.container.border-box +.border-box @include border-box() //------------------------------------------------------------------------------------- diff --git a/site.hs b/site.hs index d6bcf19..cb3c2f6 100644 --- a/site.hs +++ b/site.hs @@ -1,7 +1,7 @@ --------------------------------------------------------------------------------------------------------- {-# LANGUAGE OverloadedStrings, TupleSections #-} --------------------------------------------------------------------------------------------------------- --- (C) Copyright Collin Doering @!@YEAR@!@ +-- (C) Copyright Collin Doering 2013 -- -- 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 @@ -24,11 +24,17 @@ import Hakyll import Control.Monad +import Data.Char (chr) import Data.Monoid (mappend,mconcat,(<>)) -import Data.List (sortBy) +import Data.Maybe (maybeToList) +import Data.List (sortBy,intercalate) import Data.Ord (comparing) import Data.Functor ((<$>)) -import System.FilePath (()) +import Data.Time.Format (parseTime) +import System.Locale (defaultTimeLocale) +import Data.Time.Clock (UTCTime) +import System.Random +import System.FilePath (takeBaseName,takeFileName,()) import System.FilePath.Posix (takeBaseName) import Text.Parsec @@ -46,28 +52,74 @@ feedConfig :: FeedConfiguration feedConfig = feedConfiguration Nothing main :: IO () -main = hakyllWith myConfig $ do +main = do + -- Get a random number generator before going into Rules monad + stdGen <- getStdGen + + hakyllWith myConfig $ do -- All Versions ------------------------------------------------------------------------------------------ match "action/**" $ do route idRoute compile copyFileCompiler - match (fromRegex "^sass/default.s[ac]ss$") $ do + pageIds <- getMatches "pages/**" + fontIds <- getMatches "fonts/**" + imageIds <- getMatches "images/**" + cssIds <- getMatches "css/**" + jsIds <- getMatches "js/**" + libIds <- getMatches "lib/**" + + allSassIds <- getMatches "sass/**" + let sassIds = filter (`notElem` badIds) allSassIds + badIds = filterMatches (fromRegex "^sass/bourbon/.*$|^sass/default.s[ac]ss$") allSassIds + manifestIds = sassIds ++ fontIds ++ imageIds ++ pageIds ++ cssIds ++ libIds ++ jsIds + + sassDeps <- makePatternDependency $ fromList sassIds + manifestDeps <- makePatternDependency $ fromList manifestIds + + rulesExtraDependencies [sassDeps] $ match (fromRegex "^sass/default.s[ac]ss$") $ do route $ gsubRoute "sass/" (const "") `composeRoutes` setExtension "css" - compile $ getResourceBody >>= withItemBody (fmap compressCss . unixFilter "sass" []) + compile $ getResourceBody + >>= saveSnapshot "original" + >>= withItemBody (fmap compressCss . unixFilter "sass" []) + + rulesExtraDependencies [manifestDeps] $ create ["manifest.appcache"] $ do + route idRoute + compile $ do + manifestCacheRoutesMaybe <- sequence $ liftM getRoute (fontIds ++ pageIds ++ imageIds ++ cssIds ++ libIds ++ jsIds) + let randomNum = random stdGen :: (Int, StdGen) + randomStr = show $ fst $ randomNum + manifestStart = unlines [ "CACHE MANIFEST" + , "# " ++ randomStr + , "" ] + manifestCacheSingles = unlines [ "/index.html" + , "/default.css" ] + manifestCache = unlines $ filter (not . null) $ fmap (maybe "" ("/"++)) manifestCacheRoutesMaybe + manifestFallback = unlines ["" + , "FALLBACK:" + , "/posts/ /post-offline.html" + , "/tags/ /tags-offline.html" + , "" ] + manifestNetwork = unlines [ "NETWORK:" + , "*" + , "" ] + makeItem $ manifestStart ++ manifestCacheSingles ++ manifestCache ++ manifestFallback ++ manifestNetwork + + -- TODO: This needs to be more robust + match "*-offline.html" $ do + route idRoute + compile copyFileCompiler match "css/**" $ do route idRoute compile compressCssCompiler - match "lib/Skeleton/stylesheets/*.css" $ do - route $ gsubRoute "Skeleton/stylesheets" (const "css") + match "lib/Skeleton/*.css" $ do + route $ gsubRoute "Skeleton" (const "css") compile compressCssCompiler - forM_ [("images/**", idRoute), - ("fonts/**", idRoute), - ("lib/Skeleton/images/*", - gsubRoute "Skeleton" $ const "")] $ \(p, r) -> + forM_ [ ("images/**", idRoute) + , ("fonts/**", idRoute) ] $ \(p, r) -> match p $ do route r compile copyFileCompiler @@ -79,10 +131,22 @@ main = hakyllWith myConfig $ do tags <- buildTags ("posts/**" .&&. hasNoVersion) (fromCapture "tags/*.html") tagsRules tags $ genTagRules tags - -- paginatedPosts <- buildPaginateWith 2 (\n -> fromFilePath $ "blog/page" ++ show n ++ ".html") ("posts/**" .&&. hasNoVersion) + -- paginatedPosts <- buildPaginateWith 3 (\n -> fromFilePath $ "blog/page" ++ show n ++ ".html") ("posts/**" .&&. hasNoVersion) -- paginatedPosts <- buildPaginate ("posts/**" .&&. hasNoVersion) -- paginateRules paginatedPosts (genPaginateRules tags paginatedPosts) + -- paginate 3 $ \index maxIndex itemsForPage -> do + -- let id = fromFilePath $ "blog/page" ++ show index ++ ".html" + -- create [id] $ do + -- route idRoute + -- compile $ do + -- -- items <- sequence $ map loadTeaser itemsForPage + -- -- let itemBodies = map itemBody items + -- -- postCtx = defaultContext -- TODO + -- makeItem "" + -- >>= saveSnapshot "content" + -- >>= loadAndApplyTemplate "templates/pages/blog.haml" (taggedPostCtx tags) + match "pages/*" $ do route $ setExtension "html" compile $ do @@ -103,21 +167,14 @@ main = hakyllWith myConfig $ do pg <- loadSnapshot (fromFilePath pageTemplate) "original" >>= withItemBody (unixFilter "haml" []) >>= applyAsTemplate (sectionCtx <> masterCtx) - >>= loadAndApplyTemplate "templates/page.haml" defaultContext makeItem . itemBody $ pg - -- pandocCompiler - -- >>= loadAndApplyTemplate (fromFilePath pageTemplate) masterCtx - -- >>= loadAndApplyTemplate "templates/page.haml" defaultContext --- >>= relativizeUrls - -- TODO: add "next" and "previous" while processing templates/partials/post.haml match "posts/**" $ do route $ setExtension "html" compile $ pandocCompiler >>= saveSnapshot "content" >>= loadAndApplyTemplate "templates/partials/post.haml" (taggedPostCtx tags) - >>= loadAndApplyTemplate "templates/page.haml" defaultContext -- >>= relativizeUrls create ["atom.xml"] $ do @@ -129,7 +186,7 @@ main = hakyllWith myConfig $ do renderAtom feedConfig feedCtx blogPosts forM_ [("js/**", idRoute), - ("lib/JQuery/*", gsubRoute "JQuery" $ const $ "js"), + ("lib/JQuery/*", gsubRoute "JQuery" $ const "js"), ("lib/jquery-address/src/jquery.address.js", customRoute $ const "lib/js/jquery.address.js")] $ \(p, r) -> match p $ do @@ -148,6 +205,7 @@ main = hakyllWith myConfig $ do >>= applyAsTemplate indexCtx >>= loadAndApplyTemplate "templates/default.haml" indexCtx >>= relativizeUrls + --------------------------------------------------------------------------------------------------------- -- NOJS Version ----------------------------------------------------------------------------------------- -- -- tagsNoJs <- buildTags ("posts/**" .&&. hasVersion "nojs") (fromCapture "nojs/tags/*.html") @@ -269,7 +327,6 @@ genTagRules tags tag pattern = do makeItem "" >>= loadAndApplyTemplate "templates/tag-page.haml" tagPageCtx - >>= loadAndApplyTemplate "templates/page.haml" defaultContext version "rss" $ do route $ gsubRoute " " (const "-") `composeRoutes` setExtension "xml" @@ -277,13 +334,40 @@ genTagRules tags tag pattern = do >>= fmap (take 10) . recentFirst >>= renderAtom (feedConfiguration $ Just tag) (bodyField "description" <> defaultContext) --- genPaginateRules :: Tags -> Paginate -> PageNumber -> Pattern -> Rules () --- genPaginateRules tags paginate n pattern = do --- route $ idRoute --- compile $ pandocCompiler --- >>= loadAndApplyTemplate "templates/partials/post.haml" (taggedPostCtx tags <> paginateContext paginate) --- >>= loadAndApplyTemplate "templates/page.haml" defaultContext --- >>= relativizeUrls +genPaginateRules :: Tags -> Paginate -> PageNumber -> Pattern -> Rules () +genPaginateRules tags paginate n pattern = do + route idRoute + compile $ pandocCompiler + >>= loadAndApplyTemplate "templates/partials/post.haml" (taggedPostCtx tags <> paginateContext paginate) +-- >>= loadAndApplyTemplate "templates/page.haml" defaultContext +-- >>= relativizeUrls + +-- | Split list into equal sized sublists. +-- https://github.com/ian-ross/blog +chunk :: Int -> [a] -> [[a]] +chunk n [] = [] +chunk n xs = ys : chunk n zs + where (ys,zs) = splitAt n xs + +paginate:: Int -> (Int -> Int -> [Identifier] -> Rules ()) -> Rules () +paginate itemsPerPage rules = do + identifiers <- getMatches "posts/*" + + let sorted = sortBy (flip byDate) identifiers + chunks = chunk itemsPerPage sorted + maxIndex = length chunks + pageNumbers = take maxIndex [1..] + process i is = rules i maxIndex is + zipWithM_ process pageNumbers chunks + where + byDate id1 id2 = + let fn1 = takeFileName $ toFilePath id1 + fn2 = takeFileName $ toFilePath id2 + parseTime' fn = parseTime defaultTimeLocale "%Y-%m-%d" $ intercalate "-" $ take 3 $ splitAll "-" fn + in compare (parseTime' fn1 :: Maybe UTCTime) (parseTime' fn2 :: Maybe UTCTime) + + + loadVersion :: String -> Identifier -> Compiler (Item String) loadVersion v i = load (setVersion (listAsMaybe v) i) >>= makeItem . itemBody diff --git a/tags-offline.html b/tags-offline.html new file mode 100644 index 0000000..586d0be --- /dev/null +++ b/tags-offline.html @@ -0,0 +1,9 @@ + + + + +
+

You are currently offline and this tag page is unaccesable

+
+ + diff --git a/templates/default.haml b/templates/default.haml index e12428c..a2306d9 100644 --- a/templates/default.haml +++ b/templates/default.haml @@ -3,7 +3,8 @@ /[if IE 7] -%html.en +%html.en(manifest='manifest.appcache') + // Work in progress on application cache; %head / Basic Page Needs %meta(charset="utf-8") @@ -34,17 +35,18 @@ // %link(rel="apple-touch-icon" sizes="72x72" href="lib/images/apple-touch-icon-72x72.png") // %link(rel="apple-touch-icon" sizes="114x114" href="lib/images/apple-touch-icon-114x114.png") - %noscript - #noscript-alert.container - .alert.alert-danger - %h1 This site requires javascript! - %p - If you insist on not using javascript we provide a simplified website - %a.alert-link(href="nojs/pages") here %body $partial("templates/partials/logo-banner.haml")$ $partial("templates/partials/nav.haml")$ - #page-content.sixteen.columns.container.init.loading + + #page-content.init.loading + %noscript + #noscript-alert.container + %h1 This site requires javascript! + %p + If you insist on not using javascript we provide a simplified website + %a.alert-link(href="nojs/index.html") here + $partial("templates/partials/footer.haml")$ / External javascript libraries: JQuery, and JQuery-Address diff --git a/templates/page.haml b/templates/page.haml deleted file mode 100644 index 967232f..0000000 --- a/templates/page.haml +++ /dev/null @@ -1,2 +0,0 @@ -#page-content.sixteen.columns - $body$ diff --git a/templates/pages/contact.haml b/templates/pages/contact.haml index 584d198..583ee0e 100644 --- a/templates/pages/contact.haml +++ b/templates/pages/contact.haml @@ -1,3 +1,6 @@ #contact-page.container.border-box - .sixteen.columns + .row + #about-me-box + %p about me card here + #about-me-blurb.row $body0$ diff --git a/templates/pages/home.haml b/templates/pages/home.haml index 533f71d..c1632cc 100644 --- a/templates/pages/home.haml +++ b/templates/pages/home.haml @@ -1,16 +1,20 @@ #home-page.container.border-box - .eight.columns.alpha - %h1 About Me - #about-me-box - $aboutMe$ - .seven.columns.offset-by-one.omega - #recent-posts - %h1 Recent Posts - %hr/ - $partial("templates/partials/recent-posts-list.haml")$ - #tag-cloud - %h1 Tag Cloud - %hr/ - $tagCloud$ - .sixteen.columns - $tools$ + .row + .eight.columns.alpha + %h1 About Me + #about-me-box + $aboutMe$ + .seven.columns.offset-by-one.omega + #recent-posts + %h1 Recent Posts + %hr/ + $partial("templates/partials/recent-posts-list.haml")$ + #tag-cloud + %h1 Tag Cloud + %hr/ + $tagCloud$ + .row + #license.eight.columns.alpha + $license$ + #tools.seven.columns.offset-by-one.omega + $tools$ diff --git a/templates/partials/footer.haml b/templates/partials/footer.haml index 15b6285..c284c00 100644 --- a/templates/partials/footer.haml +++ b/templates/partials/footer.haml @@ -1,11 +1,9 @@ -#footer-wrap.sixteen.columns +#footer-wrap .container %footer #footer-left.eight.columns.alpha - %p - © - %a(href="/") RekahSoft 2013 + %p © Collin Doering 2013 #footer-right.eight.columns.omega %p - Proudly generated by - %a(href="http://jaspervdj.be/hakyll") Hakyll + Proudly crafted using + %a(href="https://www.gnu.org/philosophy/free-sw.html") Free Software diff --git a/templates/partials/logo-banner.haml b/templates/partials/logo-banner.haml index fe7bdde..7c4eef9 100644 --- a/templates/partials/logo-banner.haml +++ b/templates/partials/logo-banner.haml @@ -1,3 +1,3 @@ -#logo-background.sixteen.columns +#logo-background #logo.container diff --git a/templates/partials/nav-nojs.haml b/templates/partials/nav-nojs.haml index d71f62a..7a2ebab 100644 --- a/templates/partials/nav-nojs.haml +++ b/templates/partials/nav-nojs.haml @@ -1,4 +1,4 @@ -#nav.sixteen.columns +#nav %ul#nav-menu $for(pagesFirst)$ %li diff --git a/templates/partials/nav.haml b/templates/partials/nav.haml index 8e53925..664b4b9 100644 --- a/templates/partials/nav.haml +++ b/templates/partials/nav.haml @@ -1,4 +1,4 @@ -#nav.sixteen.columns.loading +#nav.loading %ul#nav-menu $for(pages)$ %li diff --git a/templates/tag-page.haml b/templates/tag-page.haml index 7f93045..21a7db6 100644 --- a/templates/tag-page.haml +++ b/templates/tag-page.haml @@ -1,4 +1,4 @@ -#tag-page +#tag-page.container %h1#tag $tag$ $for(posts)$ $partial("templates/partials/post-teaser.haml")$