static-copy: suppress extra output when saving pages

As it turns out, when I tried to paste an 1.5MB image, the old
settings didn't work. We need to shrink more agressively.

.cvsignore

@@ -1,8 +0,0 @@
-.DS_Store
-oddmuse-1.*
-oddmuse-inkscape-1.*
-*.patch
-*.patch.gz
-*.diff
-*.diff.gz
-test-data

.gitignore

@@ -1,4 +1,10 @@
 *~
-/current.pl
+/build/
 \#*\#
-/test-data
+/test-data*
+/Mac/pkg/
+*.dmg
+*.pkg
+.DS_Store
+wiki.log
+.prove

BUGS

@@ -1,16 +0,0 @@
-I've seen a bug that shows as follows:  <strong class="changes">think
-it belongs anymore.</stron><strong class="changes">g>.
-
-Is DiffHtmlMarkWords called twice for a chunk?
-
-It seems that following the diff link from RC to a page that has
-a minor edit at the end will show a minor diff instead of a major
-diff, eventhough it *says* that it will show a major diff!
-
-mod_perl:
-
-After a while, the script forgets some pages, so that links to these
-pages turn into questionmarks.
-
-From time to time, the script will show for a page X the page content
-of the previous page.

LICENSE

@@ -0,0 +1,675 @@
+GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU 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.
+
+    {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 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/>.
+
+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:
+
+    {project}  Copyright (C) {year}  {fullname}
+    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
+<http://www.gnu.org/licenses/>.
+
+  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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

Mac/.cvsignore

@@ -1 +0,0 @@
-pkg

Mac/Description.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IFPkgDescriptionDeleteWarning</key>
-	<string></string>
-	<key>IFPkgDescriptionDescription</key>
-	<string>A wiki engine.</string>
-	<key>IFPkgDescriptionTitle</key>
-	<string>Oddmuse</string>
-	<key>IFPkgDescriptionVersion</key>
-	<string></string>
-</dict>
-</plist>

Mac/Info.plist

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleGetInfoString</key>
-	<string>Oddmuse</string>
-	<key>CFBundleName</key>
-	<string>Oddmuse</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>IFMajorVersion</key>
-	<integer>1</integer>
-	<key>IFMinorVersion</key>
-	<integer>0</integer>
-	<key>IFPkgFlagAllowBackRev</key>
-	<false/>
-	<key>IFPkgFlagAuthorizationAction</key>
-	<string>RootAuthorization</string>
-	<key>IFPkgFlagDefaultLocation</key>
-	<string>/Library/WebServer</string>
-	<key>IFPkgFlagFollowLinks</key>
-	<false/>
-	<key>IFPkgFlagInstallFat</key>
-	<false/>
-	<key>IFPkgFlagIsRequired</key>
-	<false/>
-	<key>IFPkgFlagOverwritePermissions</key>
-	<false/>
-	<key>IFPkgFlagRelocatable</key>
-	<false/>
-	<key>IFPkgFlagRestartAction</key>
-	<string>NoRestart</string>
-	<key>IFPkgFlagRootVolumeOnly</key>
-	<true/>
-	<key>IFPkgFlagUpdateInstalledLanguages</key>
-	<false/>
-	<key>IFPkgFlagUseUserMask</key>
-	<integer>0</integer>
-	<key>IFPkgFormatVersion</key>
-	<real>0.10000000149011612</real>
-</dict>
-</plist>

Mac/Source/CGI-Executables/wiki

@@ -1,4 +0,0 @@
-#!/usr/bin/perl
-package OddMuse;
-$DataDir = '/Library/WebServer/Oddmuse';
-do 'current';

Mac/Source/Oddmuse/config

@@ -1 +0,0 @@
-$AdminPass = '';

Mac/config

@@ -1 +0,0 @@
-$AdminPass = '';

Mac/wiki

@@ -1,4 +0,0 @@
-#!/usr/bin/perl
-package OddMuse;
-$DataDir = '/Library/WebServer/Oddmuse';
-do 'current';

Makefile

@@ -1,145 +1,62 @@
-# The Makefile is only for developpers wanting to prepare the tarball.
-# Make sure the CVS keywords for the sed command on the next line are not expanded.
+# In order to build a copy of Oddmuse with all the version numbers, use:
+# make build. This creates modified copies of the files in the build
+# subdirectory.
 
 VERSION_NO=$(shell git describe --tags)
-VERSION=oddmuse-$(VERSION_NO)
-UPLOADVERSION=oddmuse-inkscape-$(VERSION_NO)
 TRANSLATIONS=$(wildcard modules/translations/[a-z]*-utf8.pl$)
 MODULES=$(wildcard modules/*.pl)
-INKSCAPE=GPL $(wildcard inkscape/*.py inkscape/*.inx inkscape/*.sh)
-PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
-PWD=$(shell pwd)
-DIST=$(VERSION).tar.gz $(VERSION).tar.gz.sig \
-	contrib/simple-install/$(VERSION)-simple.tar.gz \
-	contrib/simple-install/$(VERSION)-simple.tar.gz.sig
+BUILD=build/wiki.pl $(foreach file, $(notdir $(MODULES)) $(notdir $(TRANSLATIONS)), build/$(file))
 
-# These targets no longer work are have not been verified in a long time.
-OLDDIST=$(VERSION).dmg $(VERSION).dmg.sig \
-	$(VERSION).tar.gz $(VERSION).tar.gz.sig \
-	$(VERSION).tgz $(VERSION).tgz.sig \
-	$(UPLOADVERSION).tar.gz $(UPLOADVERSION).tar.gz.sig
+# PREPARE/BUILD: this creates copies of wiki.pl and all the modules
+# and translations in the build subdirectory. These copies all contain
+# a reference to the revision they were created from (git describe
+# --tags).
 
-dist: $(DIST)
+prepare: build $(BUILD)
 
-current.pl: wiki.pl
-	sed "s/\\\$$q->a({-href=>'http:\/\/www.oddmuse.org\/'}, 'Oddmuse')/\\\$$q->a({-href=>'http:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tag\/?id=$(VERSION_NO)'}, 'wiki.pl') . ', see ' . &/" < $< > $@
+build:
+	mkdir -p build
 
-upload: $(DIST)
+clean:
+	rm -rf build
+	prove t/setup.pl
+
+release:
+	perl stuff/release ~/oddmuse.org/releases 2.3.3
+
+build/wiki.pl: wiki.pl
+	perl -lne "s/(\\\$$q->a\(\{-href=>'https:\/\/www.oddmuse.org\/'\}, 'Oddmuse'\))/\\\$$q->a({-href=>'https:\/\/git.savannah.gnu.org\/cgit\/oddmuse.git\/tag\/?id=$(VERSION_NO)'}, 'wiki.pl') . ' ($(VERSION_NO)), see ' . \$$1/; print" < $< > $@
+
+build/%-utf8.pl: modules/translations/%-utf8.pl
+	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
+
+build/national-%.pl: modules/translations/national-%.pl
+	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
+
+build/month-names-%.pl: modules/translations/month-names-%.pl
+	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
+
+# from: https://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl
+#   to: https://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl?id=2.1-11-gd4f1e27
+
+build/%.pl: modules/%.pl
+	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, undef, '$(VERSION_NO)')/; print" < $< > $@
+
+modules/translations/new-utf8.pl: wiki.pl $(MODULES)
+	cp $@ $@-old
+	perl stuff/oddtrans -l $@-old wiki.pl $(MODULES) > $@
+	rm -f $@-old
+
+translations: $(TRANSLATIONS)
 	for f in $^; do \
-		scp $$f as@dl.sv.nongnu.org:/releases/oddmuse/; \
+	  echo updating $$f...; \
+	  perl stuff/oddtrans -l $$f wiki.pl $(MODULES) > $$f-new && mv $$f-new $$f; \
 	done
 
-upload-text: new-utf8.pl
-	wikiupload new-utf8.pl http://www.oddmuse.org/cgi-bin/oddmuse-en/New_Translation_File
-
-contrib/simple-install/$(VERSION)-simple.tar.gz:
-	cd contrib/simple-install && make $(VERSION)-simple.tar.gz
-
-$(VERSION).tar.gz: README FDL GPL ChangeLog wiki.pl $(TRANSLATIONS) $(MODULES) current.pl
-	rm -rf $(VERSION)
-	mkdir $(VERSION)
-	cp $^ $(VERSION)
-	tar czf $@ $(VERSION)
-
-$(UPLOADVERSION).tar.gz: $(INKSCAPE)
-	rm -rf $(UPLOADVERSION)
-	mkdir $(UPLOADVERSION)
-	cp $^ $(UPLOADVERSION)
-	cp wikiupload $(UPLOADVERSION)/oddmuse-upload.py
-	tar czf $@ $(UPLOADVERSION)
-
-%.sig: %
-	gpg --sign -b $<
-
-# OSX: .pkg is the package, and .dmg is the disk image.
-
-# Make sure to copy the files into a new directory so that the CVS
-#subdirectory are not inlcuded in the .pkg. And fix permissions. Skip
-#if we can't run PackageMaker. All cp commands need sudo because on a
-#second run the directories will already exist.
-$(VERSION).pkg: wiki.pl modules/creole.pl Mac/config Mac/wiki
-	if test -x $(PACKAGEMAKER); then \
-		mkdir -p Mac/pkg/CGI-Executables; \
-		sudo cp wiki.pl Mac/pkg/CGI-Executables/current; \
-		sudo cp Mac/wiki Mac/pkg/CGI-Executables/wiki; \
-		sudo chown -R root:admin Mac/pkg/CGI-Executables; \
-		sudo chmod 644 Mac/pkg/CGI-Executables/current; \
-		sudo chmod 755 Mac/pkg/CGI-Executables/wiki; \
-		mkdir -p Mac/pkg/Oddmuse; \
-		sudo cp Mac/config Mac/pkg/Oddmuse; \
-		sudo chown www:admin Mac/pkg/Oddmuse; \
-		sudo chmod 775 Mac/pkg/Oddmuse; \
-		sudo chown root:admin Mac/pkg/Oddmuse/config; \
-		sudo chmod 664 Mac/pkg/Oddmuse/config; \
-		mkdir -p Mac/pkg/Oddmuse/modules; \
-		sudo cp modules/mac.pl Mac/pkg/Oddmuse/modules; \
-		sudo cp modules/creole.pl Mac/pkg/Oddmuse/modules; \
-		sudo chown -R root:admin Mac/pkg/Oddmuse/modules; \
-		sudo chmod 775 Mac/pkg/Oddmuse/modules; \
-		sudo chmod 644 Mac/pkg/Oddmuse/modules/*; \
-		$(PACKAGEMAKER) -build \
-			-p $(PWD)/$@ \
-			-i $(PWD)/Mac/Info.plist \
-			-d $(PWD)/Mac/Description.plist \
-			-f $(PWD)/Mac/pkg; \
-	fi;
-
-$(VERSION).dmg: $(VERSION).pkg
-	hdiutil create -srcfolder $< -fs HFS+ -volname "Oddmuse" $@
-
-# Slackware: .tgz are .tar.gz files used by the installer
-# Slackware webserver is run by nobody uid/gid 99/99.
-
-$(VERSION).tgz: wiki.pl modules/creole.pl Mac/config Mac/wiki
-	sudo rm -rf Slack/var Slack/install
-	mkdir -p Slack/var/www/wiki/modules
-	mkdir -p Slack/var/www/cgi-bin
-	mkdir -p Slack/install
-	sudo cp Mac/config Slack/var/www/wiki
-	sudo cp Mac/wiki Slack/var/www/cgi-bin
-	sudo cp README Slack/var/www/wiki
-	sudo cp modules/creole.pl Slack/var/www/wiki/modules
-	sudo cp wiki.pl Slack/var/www/cgi-bin/current
-	sudo sed -e 's/VERSION/$(VERSION_NO)/' < Slack/slack-desc > Slack/install/slack-desc
-	sudo chown -R 0:0 Slack/var Slack/install
-	sudo chgrp 99 Slack/var/www/cgi-bin/wiki
-	sudo chmod 644 Slack/var/www/cgi-bin/current
-	sudo chmod 775 Slack/var/www/cgi-bin/wiki
-	cd Slack && tar czf ../$@ var install
-
-%-utf8.pl: wiki.pl $(MODULES)
-	perl oddtrans -l $@ $^ > $@-new && mv $@-new $@
-
-update-translations: $(TRANSLATIONS)
-
-upload-translations: always
-	for f in $(TRANSLATIONS); do \
-		cvs status $$f | grep 'Status: Up-to-date'; \
-		wikiput -z "ham" -u "cvs" -s "update" \
-		"http://www.oddmuse.org/cgi-bin/oddmuse/raw/$$f" < $$f; \
-	done
-
-.PHONY: always
-
-deb:
-	equivs-build control
-
-install:
-	@echo This only installs the deb file, not the script itself.
-	dpkg -i oddmuse*.deb
+# Running four jobs in parallel, but clean up data directories without
+# race conditions!
 
+jobs ?= 4
 test:
-	prove t
-
-package-upload: debian-$(VERSION).tar.gz debian-$(VERSION).tar.gz.sig
-	curl -T "{debian-$(VERSION).tar.gz,debian-$(VERSION).tar.gz.sig}" \
-	ftp://savannah.gnu.org/incoming/savannah/oddmuse/
-
-package: debian-$(VERSION).tar.gz
-	gpg --ascii --encrypt $<
-
-debian-$(VERSION).tar.gz:
-	rm -rf $(VERSION)
-	mkdir $(VERSION)
-	cp README FDL GPL wiki.pl $(VERSION)
-	tar czf $@ $(VERSION)
+	prove t/setup.pl
+	prove --jobs=$(jobs) --state=slow,save t

OddMuse.pm

@@ -1,37 +0,0 @@
-# Copyright (C) 2005  Alex Schroeder <alex@emacswiki.org>
-#
-# 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
-
-use Apache2::RequestRec ();
-use Apache2::RequestIO ();
-use Apache2::Const -compile => qw(OK);
-
-package OddMuse;
-
-$RunCGI = 0;
-require 'wiki.pl';
-
-sub handler {
-  my $r = shift;
-  for my $var (qw{DataDir UseConfig ConfigFile ModuleDir ConfigPage
-		  AdminPass EditPass ScriptName FullUrl}) {
-    no strict "refs";
-    $$var = $ENV{"Wiki$var"} if exists $ENV{"Wiki$var"}; # symbolic references
-  }
-  DoWikiRequest();
-  return Apache2::Const::OK;
-}

README

@@ -1,48 +0,0 @@
-This is the README file distributed together with the Oddmuse script.
-
-To install the script, copy wiki.pl into your cgi-bin directory.  This
-will store the pages in a temporary directory for you.  In order to
-make this permanent, change the $DataDir option in the script from
-'/tmp/oddmuse' to 'oddmuse'.  This will save the pages in a
-subdirectory of your cgi-bin directory.
-
-In order to start your wiki, click on the edit link (the first link
-below the navigation bar, at the bottom of the page).  This will allow
-you to enter some text for this page.  Click the Save button and you
-are done.
-
-To add new pages, edit the homepage and add links to new pages.  Links
-are traditionally formed by ConcatenatingCapitalizedWords.  This kind
-of link pattern is called a wiki word.
-
-Alternatively, put links in [[double square brackets]].  This kind of
-link pattern is called a free link.
-
-As long as the new pages don't exist, links to these pages are
-followed by a clickable question mark.  Click on the question mark to
-create the new page.
-
-Enjoy your wiki experience.
-
-Visit http://www.oddmuse.org/ to learn more about the translation
-files and modules that are part of this package.
-
-----------------------------------------------------------------------
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation.
-
-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.
-
-Both the GNU Free Documentation License, and the GNU General Public
-License are distributed together with this script.  See the files FDL
-and GPL, respectively.

README.creole

@@ -0,0 +1,194 @@
+This is the README file distributed together with the
+[[https://oddmuse.org/|Oddmuse]] script.
+
+== Installing Oddmuse on a Debian System running Apache
+
+The following instructions require a number of tools. You can make sure
+they're all installed by issuing the following command as {{{root}}}:
+
+{{{
+apt-get install coreutils apache2 sudo wget w3m perl \
+    libwww-perl libxml-rss-perl diffutils
+}}}
+
+You probably created an account for yourself. You might have to add this
+user to the {{{sudo}}} group. Here's how I created my own user as
+{{{root}}}:
+
+{{{
+adduser alex
+usermod -a -G sudo alex
+}}}
+
+Now you can login as {{{alex}}} and do everything else using {{{sudo}}}.
+
+You need to copy wiki.pl into your cgi-bin directory, and you need to
+make the script executable. You might also have to change its owner to
+an appropriate user on your system.
+
+{{{
+sudo wget -O /usr/lib/cgi-bin/wiki.pl \
+  http://git.savannah.gnu.org/cgit/oddmuse.git/plain/wiki.pl
+sudo chmod +x /usr/lib/cgi-bin/wiki.pl
+sudo chown www-data.www-data /usr/lib/cgi-bin/wiki.pl
+}}}
+
+If you're on SUSE, the user might not be {{{www-data}}} but
+{{{wwwrun}}} without appropriate group:
+
+{{{
+sudo chown wwwrun.root /usr/lib/cgi-bin/wiki.pl
+}}}
+
+You should be able to test it right now! Visit
+{{{http://localhost/cgi-bin/wiki.pl}}}. If your site is available from
+the outside, you will be able to use a normal browser. If don't have a
+domain name yet, you'll probably have to use a text browser like
+{{{w3m}}}.
+
+{{{
+w3m http://localhost/cgi-bin/wiki.pl
+}}}
+
+If you create pages in this wiki, these will get stored in a temporary
+directory. You need change the data directory from {{{"/tmp/oddmuse"}}}
+to like {{{"/var/local/oddmuse"}}}. The best way to do this without
+changing {{{wiki.pl}}} is by editing
+{{{/etc/apache2/sites-available/default}}}. Add the following line:
+
+{{{
+SetEnv WikiDataDir /var/local/oddmuse
+}}}
+
+Enable the default site by calling the following command:
+
+{{{
+sudo a2ensite default
+}}}
+
+Reload the Apache configuration by calling the following command:
+
+{{{
+sudo service apache2 reload
+}}}
+
+You need to create the new data directory. You webserver runs CGI
+scripts as {{{www-data}}}. Thus, you need to change the owner and group
+of the directory to {{{www-data}}}.
+
+{{{
+sudo mkdir -p /var/local/oddmuse
+sudo chown www-data.www-data /var/local/oddmuse
+}}}
+
+Done! Visit your wiki and start editing. Click on the edit link (the
+first link below the navigation bar, at the bottom of the page). This
+will allow you to enter some text for this page. Click the Save button
+and you are done.
+
+To add new pages, edit the homepage and add links to new pages by
+putting their names in {{{[[double square brackets]]}}}.
+
+Enjoy your wiki experience.
+
+Visit https://www.oddmuse.org/ to learn more about the translation
+files and modules that are part of this package.
+
+== Checking the Apache Setup
+
+If you think this information doesn't work for you, here are some things
+to check.
+
+Apache's config directory is {{{/etc/apache2/apache2.conf}}}. This is
+where we get the {{{www-data}}} username from. It says:
+
+{{{
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+}}}
+
+Checking {{{/etc/apache2/envvars}}} we see the following:
+
+{{{
+export APACHE_RUN_USER=www-data
+export APACHE_RUN_GROUP=www-data
+}}}
+
+So that's what we're using in the {{{chown}}} command in our
+instructions above.
+
+The default site is configured in
+{{{/etc/apache2/sites-available/default}}}. In order for it to be
+//enabled//, there must be a symlink from a file in
+{{{/etc/apache2/sites-enabled}}} to the file in
+{{{sites-available}}}. You can enable it using the following command:
+
+{{{
+sudo a2ensite default
+}}}
+
+This file also lists the directories we've used in our instructions
+above.
+
+{{{
+ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+}}}
+
+This means that {{{http://localhost/cgi-bin/wiki.pl}}} will call
+{{{/usr/lib/cgi-bin/wiki.pl}}}
+
+Don't forget to reload the Apache configuration as shown above, or
+simply restart it all:
+
+{{{
+sudo service apache2 graceful
+}}}
+
+== Using just Perl
+
+You can use Mojolicious as your web server. There is a simple
+##server.pl## which you can use. Here's how you might start it:
+
+{{{
+mkdir ~/oddmuse
+WikiDataDir=$HOME/oddmuse perl server.pl daemon
+}}}
+
+This makes the server available on {{{http://localhost:3000/wiki}}}.
+
+If it works for you, feel free to upgrade to Hypnotoad.
+
+{{{
+WikiDataDir=$HOME/oddmuse hypnotoad server.pl
+}}}
+
+Note: Hypnotoad uses a different default port. The above makes the
+server available on {{{http://localhost:8080/wiki}}}. Hypnotoad will
+keep forking new processes. To stop it, use the {{{-s}}} flag.
+
+{{{
+hypnotoad -s server.pl
+}}}
+
+== License
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation.
+
+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.
+
+Both the GNU Free Documentation License, and the GNU General Public
+License are distributed together with this script. See the files
+[[https://github.com/kensanata/oddmuse/blob/master/FDL|FDL]] and
+[[https://github.com/kensanata/oddmuse/blob/master/GPL|GPL]],
+respectively.

Slack/.cvsignore

@@ -1,2 +0,0 @@
-install
-var

Slack/slack-desc

@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-oddmuse: Oddmuse VERSION
-oddmuse: 
-oddmuse: Oddmuse is the name of the wiki engine being further developed by
-oddmuse: Alex Schröder. The wiki engine consists of one big Perl script.
-oddmuse: When installed on a web host, the script generates a wiki -- a
-oddmuse: web site where users can read pages, change pages, add new pages,
-oddmuse: and delete old pages. All pages are accessed via the script.
-oddmuse: 
-oddmuse: This package will also install the Creole markup extension.
-oddmuse: 
-oddmuse: Package created by Alex Schröder

contrib/OddMuseWiki.spec

@@ -1,172 +0,0 @@
-Name: OddMuseWiki
-Version: 2007.12.31
-Release: 1suse
-Group: Applications/Productivity
-License: /opt/OddMuseWiki/doc/COPYING
-Summary: Simple user-editted website (wiki)
-
-Distribution: any perl+webserver+cgi distro
-Vendor: Alex Schröder
-Packager: Dr. Robert J. Meier <grandfather@sourceforge.org>
-URL: http://www.oddmusewiki.org/
-
-BuildRoot: /var/tmp/rpm-oddmusewiki-root
-BuildArch: noarch
-Prefix: /opt/OddMuseWiki
-Prefix: /srv/www/wiki
-Prefix: /srv/www/cgi-bin
-Prefix: /etc/httpd/conf.d
-Source0: %{name}-%{version}.tar.gz
-Source1: %{name}-modules-%{version}.tar.gz
-Source2: %{name}-contents-%{version}.tar.gz
-
-Provides: wiki
-Requires: perl >= 5.0.0
-
-# Avoid automatic dependency calculation macros, as they are seldom portable.
-AutoReq: no
-AutoProv: no
-
-
-
-%description
-OddMuseWiki is a program to run a wiki.
-A wiki can be used for communication in a team or for documentation,
-when things have to be quick and easy: Content Management for everybody.
-
-A wiki enables other people to quickly join efforts. In the office,
-you can introduce new employees, distribute phone lists, store memos,
-plan trips, document projects, prepare meetings,
-or describe internal processes.
-
-For many free software projects wikis have taken an important role
-somewhere between manual, FAQ, IRC, and mailing lists.
-
-OddMuseWiki is very easy to install: Simple installation, compact code,
-and easy extensibility were the most important design factors.
-
-Features
-
-   1. Easy to install: Just copy one file into the correct directory.
-   2. No dependencies on version management tools or database installation.
-   3. Web server needs only Perl installed.
-   4. Easy to use for users, easy to hack for programmers.
-   5. Capable of multilingual sites.
-   6. Unicode (UTF-8) per default.
-   7. Valid HTML; CSS friendly.
-   8. Caching on several levels.
-   9. Easy to download.
-
-
-
-%prep
-# Record the environment variables
-#                     $RPM_ARCH $RPM_OS - host configuration
-#                        $RPM_OPT_FLAGS - c compile flags
-#   $RPM_PACKAGE_[NAME VERSION RELEASE] - spec file fields
-#                       $RPM_SOURCE_DIR - base for Source and Patch filenames
-#                        $RPM_BUILD_DIR - base for setup macro filenames
-#                       $RPM_BUILD_ROOT - %{BuildRoot}
-#                                           modified by rpmbuild --buildroot
-#                          $RPM_DOC_DIR - base for doc macro filenames
-if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-prep.log; fi
-
-%setup -q -b1 -b2
-
-
-
-%build
-# Record the environment variables
-#   Nomimally these are the same as for %prep
-if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-build.log; fi
-
-# Nothing to build yet.
-
-
-
-%install
-# Record the environment variables
-#   Nomimally these are the same as for %prep
-if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-install.log; fi
-
-rm -rf "$RPM_BUILD_ROOT"
-mkdir -p "$RPM_BUILD_ROOT"/opt/OddMuseWiki/cgi-bin
-mkdir -p "$RPM_BUILD_ROOT"/opt/OddMuseWiki/doc
-mkdir -p "$RPM_BUILD_ROOT"/opt/OddMuseWiki/etc
-mkdir -p "$RPM_BUILD_ROOT"/opt/OddMuseWiki/libperl
-mkdir -p "$RPM_BUILD_ROOT"/srv/www/cgi-bin
-mkdir -p "$RPM_BUILD_ROOT"/srv/www/wiki
-mkdir -p "$RPM_BUILD_ROOT"/etc/httpd/conf.d
-
-install cgi-bin/wiki.pl "$RPM_BUILD_ROOT"/opt/OddMuseWiki/cgi-bin
-install cgi-bin/wiki.pl "$RPM_BUILD_ROOT"/srv/www/cgi-bin
-install doc/COPYING "$RPM_BUILD_ROOT"/opt/OddMuseWiki/doc
-install etc/oddmusewiki.conf "$RPM_BUILD_ROOT"/opt/OddMuseWiki/etc
-install libperl/current libperl/*.pl "$RPM_BUILD_ROOT"/opt/OddMuseWiki/libperl
-cp -r wiki "$RPM_BUILD_ROOT"/srv/www
-
-
-
-%clean
-# Record the environment variables
-#   Nomimally these are the same as for %prep
-if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-clean.log; fi
-rm -rf "$RPM_BUILD_ROOT"
-
-
-
-%pre
-# Record local environment variables.
-#   $RPM_INSTALL_PREFIX* reflect the Prefix: field(s)
-#   modified by --relocate and --prefix arguments
-if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-pre.log; fi
-
-
-
-%post
-# Record local environment variables
-#   $RPM_INSTALL_PREFIX* reflect the Prefix: field(s)
-#   modified by --relocate and --prefix arguments
-if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-post.log; fi
-
-# Because relocation may change configuration,
-#   it cannot be symlinked into a public access site at rpmbuild -bb time.
-if [ \( -d "$RPM_INSTALL_PREFIX2" -a -w "$RPM_INSTALL_PREFIX2" \) -o -w "$RPM_INSTALL_PREFIX2"/wiki.pl ]; then
-  cat "$RPM_INSTALL_PREFIX0"/cgi-bin/wiki.pl |
-  perl -pe 's:/opt/OddMuseWiki:'"$RPM_INSTALL_PREFIX0"':;' |
-  perl -pe 's:/srv/www/wiki:'"$RPM_INSTALL_PREFIX1"':;' |
-  cat > "$RPM_INSTALL_PREFIX2"/wiki.pl
-fi
-
-
-
-%preun
-# Record local environment variables
-#   $RPM_INSTALL_PREFIX* reflect the Prefix: field(s)
-#   modified by --relocate and --prefix arguments at rpm -i time
-if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-preun.log; fi
-
-
-
-%postun
-# Record local environment variables
-#   $RPM_INSTALL_PREFIX* reflect the Prefix: field(s)
-#   modified by --relocate and --prefix arguments at rpm -i time
-if [ "$RPM_DUMPENV" != "" ] ; then env | sort > /tmp/rpm-postun.log; fi
-
-
-
-%files
-# The doc, config, attr and many other macros are well documented in RPM-HOWTO
-%defattr(0444,root,root)
-%license
-%attr(0555,root,root) /opt/OddMuseWiki
-%config /opt/OddMuseWiki/etc/oddmusewiki.conf
-%attr(0777,root,root) /srv/www/wiki
-%attr(0555,root,root) /srv/www/cgi-bin/wiki.pl
-
-
-
-%changelog
-* Wed Jan 3 2008 Dr. Robert Meier <grandfather@sourceforge.org> 2007.12.13-1suse
-- copy-and-edit from hello.rpm

contrib/README.md

@@ -0,0 +1,8 @@
+Code for Special Circumstances
+==============================
+
+The files in this directory serve a particular purpose which might be
+of interest to others. These are not generic scripts (there is a
+separate directory for those). These are CGI scripts that post to a
+Campaign Wiki, that allow you to edit wikis using Emacs, that copy
+data from a particular site and post them to the Emacs Wiki.

contrib/campaignwiki/README

@@ -0,0 +1,37 @@
+The files in this directory are used to run https://campaignwiki.org/
+
+add-link.pl
+===========
+
+This is used to add links to the Links To Wisdom wiki. This wiki is a
+bookmark site: A few pages make up a big unordered list of links in
+wiki format. add-link is a tool to help users contribute new links to
+the list.
+
+https://campaignwiki.org/wiki/LinksToWisdom/HomePage
+
+copy.pl
+=======
+
+This is used to copy the text from a web page to a wiki page. The idea
+was to keep archive copies of cool pages somewhere. The Blog Archive
+never got used, though.
+
+https://campaignwiki.org/wiki/BlogArchive/HomePage
+
+monster-tag.pl
+==============
+
+This is used to quickly tag many pages in the Monsters wiki. The
+Monsters wiki hasn't been used in a long time, though.
+
+https://campaignwiki.org/wiki/Monsters/HomePage
+
+submit.pl
+=========
+
+This used to be used to add sites to the Old School RPG Planet. The
+aggregator was configured via a wiki page on the Planet wiki. It's now
+abandoned.
+
+https://campaignwiki.org/wiki/Planet/HomePage

contrib/campaignwiki/add-link.pl

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2011  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2011–2015  Alex Schroeder <alex@gnu.org>
 
 # 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
@@ -15,23 +15,46 @@
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
 package OddMuse;
+
 use LWP::UserAgent;
 use HTML::TreeBuilder;
+use JSON::PP;
 use utf8;
 
 # load Oddmuse core
 $RunCGI = 0;
 do "wiki.pl";
 
-# globals
-my $name = "OSR Links to Wisdom";
-my $wiki = 'LinksToWisdom';
-my $site = "http://campaignwiki.org/wiki/$wiki";
+# globals depending on the name of the script
+my ($self, $name, $wiki);
+if ($0 eq '/home/alex/campaignwiki.org/add-link.pl') {
+  $self = "https://campaignwiki.org/add-link";
+  $name = "OSR Links to Wisdom";
+  $wiki = 'LinksToWisdom';
+} elsif ($0 eq '/home/alex/campaignwiki.org/add-adventure.pl') {
+  $self = "https://campaignwiki.org/add-adventure";
+  $name = "OSR Links to Adventures";
+  $wiki = 'Adventures';
+} else {
+  ReportError('Cannot determine wiki!', '500 INTERNAL SERVER ERROR');
+}
+
+# derived variables
+my $site = "https://campaignwiki.org/wiki/$wiki";
 # my $site = "http://localhost/wiki.pl";
 my $home = "$site/$HomePage";
+# http://www.emacswiki.org/pics/star.png
+my $stardata = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAFVBMVEUAAHkAAACzdRTapx3twwD/9qb////1YCa0AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfXAQYCJAu+WhwbAAAAKnRFWHRDb21tZW50AGJ5IFJhZG9taXIgJ1RoZSBTaGVlcCcgRG9waWVybGFza2kVfTXbAAAAYElEQVQI12NgQAKMMIaYAFTAzRDKCHOEMETCnEFyjIJhYS6OggwMoqGhaS7GRgIMjC6uYc5GikA5YRcXIyWwotBgJUWw7lAXsAyDaIihMlhK1FFA0AjEEAESQgJQu4EYAPAPC2XcokgQAAAAAElFTkSuQmCC';
 
 main();
 
+sub canonical {
+  my $url = shift;
+  # handle blogspot domain munging
+  $url =~ s/blogspot(\.[a-z]+)+/blogspot.com/;
+  return $url;
+}
+
 sub toc {
   # start with the homepage
   my @values;
@@ -47,9 +70,60 @@ sub toc {
       $labels{$value} = $label;
     }
   }
+  return \@values, \%labels;
+}
+
+sub top {
+  # start with the homepage
+  my %blog;
+  my $n;
+  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
+    for my $item (GetPageContent(FreeToNormal($id)) =~ /^\*+\s+\[(https?:\/\/[^\/\n\t ]+)/mg) {
+      $n++;
+      $blog{canonical($item)}++;
+    }
+  }
+  print $q->p("Total links counted: $n.");
+  my @list = sort { $blog{$b} <=> $blog{$a} } keys %blog;
+  # my $max = scalar @list;
+  # $max = 20 if $max > 20;
+  # @list = @list[0 .. $max -1];
+  @list = map {
+    my $domain = substr($_, index($_, '://') + 3);
+    my $term = quotemeta($domain);
+    # handle blogspot domain munging
+    $term =~ s/blogspot\\\.com/blogspot(\\.[a-z]+)+/;
+    $term = QuoteHtml($term);
+    $q->a({-href => $_}, $domain)
+	. " (" . $q->a({-href => "$self/match/$term"}, $blog{$_}) . ")";
+  } @list;
+  return \@list;
+}
+
+sub match {
+  my $term = shift;
+  # start with the homepage
+  my @list;
+  my $title;
+  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
+    for my $line (split /\n/, GetPageContent(FreeToNormal($id))) {
+      if ($line =~ /^\*+\s+([^][\n]*)$/) {
+	$title = $1;
+      } elsif ($line =~ /$term/o) {
+	if ($line =~ /^\*+\s+\[(https?:\S+)\s+([^]]+)\]/) {
+	  push (@list, $q->a({-href => $1}, $2) . " (" . $title . ")");
+	}
+      }
+    }
+  }
+  return \@list;
+}
+
+sub html_toc {
+  my ($values, $labels) = toc();
   return $q->radio_group(-name =>'toc',
-			 -values => \@values,
-			 -labels => \%labels,
+			 -values => $values,
+			 -labels => $labels,
 			 -linebreak=>'true');
 }
 
@@ -57,102 +131,134 @@ sub default {
   print $q->p("Add a link to the " . $q->a({-href=>$home}, $name) . ".");
   print $q->start_multipart_form(-method=>'get', -class=>'submit');
   print $q->p($q->label({-for=>'url'}, T('URL:')) . ' '
-	      . $q->textfield(-name=>'url', -id=>'url', -size=>50));
-  print toc();
-  print $q->submit('go', 'Add!');
-  print $q->end_form();
-  print $q->p("Drag this bookmarklet to your bookmarks bar for easy access:",
+	      . $q->textfield(-name=>'url', -id=>'url', -size=>80));
+  print $q->p({-style=>'font-size: 10pt'},
+	      "(Drag this bookmarklet to your bookmarks bar for easy access:",
 	      $q->a({-href=>q{javascript:location='}
 		   . $q->url()
 		   . qq{?url='+encodeURIComponent(window.location.href)}},
-		    "Submit $name") . ".");
+		    "Submit $name") . ".)");
+  print html_toc();
+  print $q->submit('go', 'Add!');
+  print $q->end_form();
 }
 
-sub check_url {
-  my $toc = GetParam('toc');
-  return default() unless $toc;
-  my $url = shift;
-  if (not GetParam('confirm', 0)) {
-    my $name = get_name($url);
-    print $q->p("Please confirm that you want to add "
-		. GetUrl($url, $name)
-		. " to the section “$toc”.");
-    print $q->start_form(-method=>'get');
-    print $q->p($q->label({-for=>'name', -style=>'display: inline-block; width:30ex'},
-			  T('Use a different link name:')) . ' '
-		. $q->textfield(-style=>'display: inline-block; width:60ex',
-				-name=>'name', -id=>'name', -size=>50, -default=>$name)
-		. $q->br()
-	        . $q->label({-for=>'username', -style=>'display: inline-block; width:30ex'},
-			    T('Your name for the log file:')) . ' '
-	        . $q->textfield(-style=>'display: inline-block; width:60ex',
-				-name=>'username', -id=>'username', -size=>50));
-    my $star = $q->img({-src=>'http://www.emacswiki.org/pics/star.png', -class=>'smiley',
-			-alt=>'star'});
-    print '<p>Optionally: Do you want to rate it?<br />';
-    my $i = 0;
-    foreach my $label ($q->span({-style=>'display: inline-block; width:15ex'}, $star)
-		       . 'I might use this for my next campaign',
-		       $q->span({-style=>'display: inline-block; width:15ex'}, $star x 2)
-		       . 'I have used this in a campaign and it worked as intended',
-		       $q->span({-style=>'display: inline-block; width:15ex'}, $star x 3)
-		       . 'I have used it in many of my campaigns',
-		       $q->span({-style=>'display: inline-block; width:15ex'}, $star x 4)
-		       . 'Everybody should give it a try',
-		       $q->span({-style=>'display: inline-block; width:15ex'}, $star x 5)
-		       . 'Everybody should use it, that is how awesome it is!') {
-      $i++;
-      print qq{<label><input type="radio" name="stars" value="$i" $checked/>$label</label><br />};
+sub links {
+  # start with the homepage
+  my @links; # [["url", "title", "page id"], ...]
+  for my $id (GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g) {
+    for my $item (GetPageContent(FreeToNormal($id)) =~ /^\*+\s+\[(https?:\/\/.*?)\]/mg) {
+      my ($url, $title) = split(/\s+/, $item, 2);
+      push(@links, [$url, $title, $id]);
     }
-    print '</p>';
-    print $q->hidden('url', $url);
-    print $q->hidden('toc', $toc);
-    print $q->hidden('confirm', 1);
-    print $q->submit('go', 'Continue');
-    print $q->end_form();
-  } else {
-    post_addition($q->param('name'), $url, $toc);
   }
+  return @links;
 }
 
+sub is_duplicate {
+  my $url = shift;
+  for my $link (links()) {
+    if ($link->[0] eq $url) {
+      print $q->p($q->strong("Oops, we seem to have a problem!"));
+      print $q->p(GetPageLink(NormalToFree($link->[2])),
+                  " already links to the URL you submitted:",
+	        GetUrl($link->[0], $link->[1]));
+      return 1;
+    }      
+  }
+  return 0;
+}
+
+sub confirm {
+  my ($url, $name, $toc) = @_;
+  print $q->p("Please confirm that you want to add "
+	      . GetUrl($url, $name)
+	      . " to the section “$toc”.");
+  print $q->start_form(-method=>'get');
+  print $q->p($q->label({-for=>'name', -style=>'display: inline-block; width: 15em'},
+			T('Use a different link name:')) . ' '
+	      . $q->textfield(-style=>'display: inline-block; width:50ex',
+			      -name=>'name', -id=>'name', -size=>50, -default=>$name)
+	      . $q->br()
+	      . $q->label({-for=>'summary', -style=>'display: inline-block; width:15em'},
+			  T('An optional short summary:')) . ' '
+	      . $q->textfield(-style=>'display: inline-block; width:50ex',
+			      -name=>'summary', -id=>'summary', -size=>50)
+	      . $q->br()
+	      . $q->label({-for=>'username', -style=>'display: inline-block; width:15em'},
+			  T('Your name for the log file:')) . ' '
+	      . $q->textfield(-style=>'display: inline-block; width:50ex',
+			      -name=>'username', -id=>'username', -size=>50));
+  my $star = $q->img({-src=>$stardata, -class=>'smiley', -alt=>'☆'});
+  print '<p>Optionally: Do you want to rate it?<br />';
+  my $i = 0;
+  foreach my $label ($q->span({-style=>'display: inline-block; width:3em'}, $star)
+		     . 'I might use this for my campaign',
+		     $q->span({-style=>'display: inline-block; width:3em'}, $star x 2)
+		     . 'I have used this in a campaign and it worked as intended',
+		     $q->span({-style=>'display: inline-block; width:3em'}, $star x 3)
+		     . 'I have used this in a campaign and it was ' . $q->em('great')) {
+    $i++;
+    print qq{<label><input type="radio" name="stars" value="$i" $checked/>$label</label><br />};
+  }
+  print '</p>';
+  print $q->hidden('url', $url);
+  print $q->hidden('toc', $toc);
+  print $q->hidden('confirm', 1);
+  print $q->submit('go', 'Continue');
+  print $q->end_form();
+}
+
+# returns unquoted html
 sub get_name {
   my $url = shift;
   my $tree = HTML::TreeBuilder->new_from_content(GetRaw($url));
-  my $h = $tree->look_down('_tag', 'h1');
-  $h = $tree->look_down('_tag', 'title') unless $h;
+  my $h = $tree->look_down('_tag', 'title');
+  $h = $tree->look_down('_tag', 'h1') unless $h;
   $h = $h->as_text if $h;
   return $h;
 }
 
 sub post_addition {
-  my ($name, $url, $toc) = @_;
+  my ($url, $name, $toc, $summary) = @_;
   my $id = FreeToNormal($name);
   my $display = $name;
   utf8::decode($display); # we're dealing with user input
+  utf8::decode($summary); # we're dealing with user input
   print $q->p("Adding ", GetUrl($url, $display), " to “$toc”.");
   # start with the homepage
   my @pages = GetPageContent($HomePage) =~ /\* \[\[(.*?)\]\]/g;
   for my $id (@pages) {
-    return post($id, undef, $name, $url, GetParam('stars', '')) if $id eq $toc;
+    return post($id, undef, $name, $summary, $url, GetParam('stars', '')) if $id eq $toc;
     my $data = GetPageContent(FreeToNormal($id));
     while ($data =~ /(\*+ ([^][\n]*))$/mg) {
-      return post($id, $1, $name, $url, GetParam('stars', '')) if $2 eq $toc;
+      return post($id, $1, $name, $summary, $url, GetParam('stars', '')) if $2 eq $toc;
     }
   }
   print $q->p("Whoops. I was unable to find “$toc” in the wiki. Sorry!");
 }
 
 sub post {
-  my ($id, $toc, $name, $url, $stars) = @_;
+  my ($id, $toc, $name, $summary, $url, $stars) = @_;
   my $data = GetPageContent(FreeToNormal($id));
+  my $re = quotemeta($url);
+  if ($data =~ /$re\s+(.*?)\]/) {
+    my $display = $1;
+    print $q->p($q->strong("Oops, we seem to have a problem!"));
+    print $q->p(GetPageLink(NormalToFree($id)),
+		" already links to the URL you submitted:",
+	        GetUrl($url, $display));
+    return;
+  }
   $stars = ' ' . (':star:' x $stars) if $stars;
+  $summary = ': ' . $summary if $summary;
   if ($toc) {
     $toc =~ /^(\*+)/;
     my $depth = "*$1"; # one more!
     my $regexp = quotemeta($toc);
-    $data =~ s/$regexp/$toc\n$depth \[$url $name\]$stars/;
+    $data =~ s/$regexp/$toc\n$depth \[$url $name\]$summary$stars/;
   } else {
-    $data = "* [$url $name]$stars\n" . $data;
+    $data = "* [$url $name]$summary$stars\n" . $data;
   }
   my $ua = LWP::UserAgent->new;
   my %params = (text => $data,
@@ -166,37 +272,77 @@ sub post {
   my $response = $ua->post($site, \%params);
   if ($response->is_error) {
     print $q->p("The submission failed!");
-    print $q->pre($response->status_line . "\n"
-  		  . $response->content);
+    print $response->content;
   } else {
     print $q->p("See for yourself: ", GetPageLink($id));
   }
 }
 
+sub print_end_of_page {
+    print $q->p('Questions? Send mail to Alex Schroeder <'
+		. $q->a({-href=>'mailto:kensanata@gmail.com'},
+			'kensanata@gmail.com') . '>');
+    print $q->end_div();
+    PrintFooter();
+}
+
 sub main {
   $ConfigFile = "$DataDir/config"; # read the global config file
   $DataDir = "$DataDir/$wiki";     # but link to the local pages
   Init();                          # read config file (no modules!)
   $ScriptName = $site;             # undo setting in the config file
+  $FullUrl = $site;                #
+  InitPageVariables();             # call again: $ScriptName was wrong
   binmode(STDOUT,':utf8');
   $q->charset('utf8');
   if ($q->path_info eq '/source') {
     seek DATA, 0, 0;
     print "Content-type: text/plain; charset=UTF-8\r\n\r\n", <DATA>;
+  } elsif ($q->path_info eq '/structure') {
+    my ($values, $labels) = toc();
+    my @indented = map {
+      ($labels->{$_} || $_) =~ /^( *)/;
+      [$_, length($1)]
+    } @$values;
+    print "Content-type: application/json; charset=UTF-8\r\n\r\n";
+    binmode(STDOUT,':raw'); # because of encode_json
+    print JSON::PP::encode_json(\@indented);
+  } elsif ($q->path_info eq '/toc') {
+    my ($values, $labels) = toc();
+    print "Content-type: application/json; charset=UTF-8\r\n\r\n";
+    binmode(STDOUT,':raw'); # because of encode_json
+    print JSON::PP::encode_json($values);
+  } elsif ($q->path_info eq '/top') {
+    print GetHeader('', 'Top Blogs');
+    print $q->start_div({-class=>'content top'});
+    print $q->ol($q->li(top()));
+    print_end_of_page();
+  } elsif ($q->path_info =~ '^/match/(.*)') {
+    my $term = $1;
+    print GetHeader('', "Entries Matching '$term'");
+    print $q->start_div({-class=>'content match'});
+    print $q->ol($q->li(match($term)));
+    print_end_of_page();
   } else {
+    push(@UserGotoBarPages, 'Help');
     $UserGotoBar = $q->a({-href=>$q->url . '/source'}, 'Source');
     print GetHeader('', 'Submit a new link');
     print $q->start_div({-class=>'content index'});
-    if (not GetParam('url')) {
+    my $url = canonical(GetParam('url'));
+    my $name = UnquoteHtml(GetParam('name', get_name($url)));
+    my $toc = GetParam('toc');
+    my $confirm = GetParam('confirm');
+    my $summary = GetParam('summary');
+    if (not $url) {
       default();
+    } elsif (not $toc) {
+      default() if not is_duplicate($url);
+    } elsif (not $confirm) {
+      confirm($url, $name, $toc);
     } else {
-      check_url(GetParam('url'));
+      post_addition($url, $name, $toc, $summary);
     }
-    print $q->p('Questions? Send mail to Alex Schroeder <'
-		. $q->a({-href=>'mailto:kensanata@gmail.com'},
-			'kensanata@gmail.com') . '>');
-    print $q->end_div();
-    PrintFooter();
+    print_end_of_page();
   }
 }
 

contrib/campaignwiki/copy.pl

@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2011  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2011–2014  Alex Schroeder <alex@gnu.org>
 
 # 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
@@ -17,63 +17,62 @@
 package OddMuse;
 use LWP::UserAgent;
 use HTML::TreeBuilder;
+use utf8;
 
 # load Oddmuse core
 $RunCGI = 0;
 do "wiki.pl";
 
-# globals
-my $wiki = 'BlogArchive';
-my $site = "http://campaignwiki.org/wiki/$wiki";
-# my $site = "http://localhost/wiki.pl";
-my $home = "$site/HomePage";
+$default_namespace = 'NameOfYourWiki';
 
 main();
 
 sub default {
-  print $q->p("Copy a blog article to the "
-	      . $q->a({-href=>$home}, $wiki) . ".");
-  print $q->start_multipart_form(-method=>'get', -class=>'submit');
-  print $q->p($q->label({-for=>'url'}, T('URL:')) . ' '
-	      . $q->textfield(-name=>'url', -id=>'url', -size=>50));
+  my ($url, $ns) = @_;
+  print $q->start_multipart_form(-method=>'get', -class=>'copy');
+  print $q->p("This script helps you copy of a blog post to your Campaign Wiki.");
+  print $q->p($q->label({-for=>'url', -style=>'display: inline-block; width: 20ex'}, 'Blog post URL:'),
+	      $q->textfield(-name=>'url', -id=>'url', -size=>50),
+	      $q->br(),
+	      $q->label({-for=>'ns', -style=>'display: inline-block; width: 20ex'}, 'Name of your wiki:'),
+	      $q->textfield(-name=>'ns', -id=>'ns', -size=>50, -default=>$default_namespace));
+  if ($url and not $ns) {
+    print $q->p($q->em('Please provide the name of your wiki. It is mandatory. Use “NameOfYourWiki” if you just want to test something.'));
+  }
   print $q->submit('go', 'Go!');
   print $q->end_form();
   print $q->p("Please make sure you’re only submitting your own articles",
 	      "or articles with an appropriate license.");
-
   print $q->p("Drag this bookmarklet to your bookmarks bar for easy access:",
-	      $q->a({-href=>q{javascript:location='http://campaignwiki.org/copy?url='+encodeURIComponent(window.location.href)}}, $wiki) . ".");
+	      $q->a({-href=>q{javascript:location='http://campaignwiki.org/copy?url='+encodeURIComponent(window.location.href)}}, 'Copy Blog Post') . ".");
 }
 
-sub check_url {
-  my $url = shift;
-  print $q->p("Looking at ", $q->a({-href=>$url}, $url));
-  my ($name, $data) = get_data($url);
-  $name = GetParam('name', $name);
-  if (name_exists($name) and not GetParam('confirm', 0)) {
-    print $q->p("We already have a page with that name: ",
-		$q->a({-href=>$duplicate}, $duplicate));
-    print $q->start_multipart_form(-method=>'get', -class=>'submit');
-    print $q->p($q->label({-for=>'name'}, T('New name:')) . ' '
-		. $q->textfield(-name=>'name', -id=>'name', -size=>50,
-				-default=>$name));
-    print $q->hidden('url', $url);
-    print $q->hidden('confirm', 1);
-    print $q->submit('go', 'Continue');
-    print $q->end_form();
-  } elsif (not GetParam('confirm', 0)) {
-    print $q->p("Please confirm that you want to copy this article to the wiki.");
-    print $q->start_multipart_form(-method=>'get', -class=>'submit');
-    print $q->p($q->label({-for=>'name'}, T('Name:')) . ' '
-		. $q->textfield(-name=>'name', -id=>'name', -size=>50,
-				-default=>$name));
-    print $q->hidden('url', $url);
-    print $q->hidden('confirm', 1);
-    print $q->submit('go', 'Continue');
-    print $q->end_form();
-  } else {
-    post_addition($name, $data, $url);
-  }
+sub confirm_overwrite {
+  my ($url, $ns, $name) = @_;
+  print $q->p("We already have a page with that name: ", GetPageLink($name));
+  print $q->start_multipart_form(-method=>'get', -class=>'submit');
+  print $q->p($q->label({-for=>'name'}, T('New name:')) . ' '
+	      . $q->textfield(-name=>'name', -id=>'name', -size=>50, -default=>$name));
+  print $q->hidden('url', $url);
+  print $q->hidden('ns', $ns);
+  print $q->hidden('confirm', 1);
+  print $q->submit('go', 'Continue');
+  print $q->end_form();
+}
+
+sub confirm_save {
+  my ($url, $ns, $name) = @_;
+  my $ns = GetParam('ns', $default_namespace);
+  print $q->p("Please confirm that you want to copy",
+	      $q->a({-href=>$url}, "this article"), "to", GetPageLink($HomePage, $ns) . ".");
+  print $q->start_multipart_form(-method=>'get', -class=>'submit');
+  print $q->p($q->label({-for=>'name'}, T('Name:')) . ' '
+	      . $q->textfield(-name=>'name', -id=>'name', -size=>50, -default=>$name));
+  print $q->hidden('url', $url);
+  print $q->hidden('ns', $ns);
+  print $q->hidden('confirm', 1);
+  print $q->submit('go', 'Continue');
+  print $q->end_form();
 }
 
 sub get_data {
@@ -82,24 +81,32 @@ sub get_data {
   my $h = $tree->look_down('_tag', 'h1');
   $h = $tree->look_down('_tag', 'title') unless $h;
   $h = $h->as_text if $h;
-  my $b = $tree->look_down('_tag', 'body');
-  if ($b = $tree->look_down('_tag', 'div',
-			    'class', qr/post-body/)) {
-    # blogspot
+  my $b;
+  if ($b = $tree->look_down('_tag', 'div', 'class', qr/post-body/)) {
+    # Blogspot
+    $b = html($b);
+  } elsif ($b = $tree->look_down('_tag', 'div', 'class', qr/content/)) {
+    # Oddmuse
     $b = html($b);
   } else {
-    # no idea, just get the text
-    $b = $b->as_text if $b;
+    # default: get it all
+    $b = html($tree->look_down('_tag', 'body'));
   }
+  # common illegal character for page names
+  $h =~ s/:/,/g;
   return ($h, $b);
 }
 
 sub html {
-  my $tree = shift;
+  my ($tree, $p) = @_;
+  # $p indicates whether we need an empty line or not
   my $str;
   for my $element ($tree->content_list()) {
     if (not ref $element) {
       $str .= $element;
+    } elsif ($element->tag() eq 'p') {
+      $str .= ($p == 1 ? "\n\n" : "") . html($element);
+      $p = 1;
     } elsif ($element->tag() eq 'br') {
       $str .= "\n\n";
     } elsif ($element->tag() eq 'span'
@@ -107,6 +114,20 @@ sub html {
       $str .= "[b]" . html($element) . "[/b]";
     } elsif ($element->tag() =~ m/^(b|i|h[1-6])$/) {
       $str .= "[$1]" . html($element) . "[/$1]";
+    } elsif ($element->tag() eq 'a'
+	     and $element->attr('href')) {
+      $str .= "[url=" . $element->attr('href') . "]" . html($element) . "[/url]";
+    } elsif ($element->tag() eq 'img'
+	     and $element->attr('src')) {
+      $str .= "[img]" . $element->attr('src') . "[/img]";
+    } elsif ($element->tag() eq 'pre') {
+      $str .= "\n\n[code]\n" . $element->as_text() . "\n[/code]";
+      $p = 1;
+    } elsif ($element->tag() eq 'div'
+	     and ($element->attr('style') =~ /float: *(left|right)/
+		  or $element->attr('style') =~ /text-align: *(center)/)) {
+      $str .= "\n[$1]" . html($element) . "[/$1]";
+      $p = 1;
     } else {
       $str .= html($element);
     }
@@ -123,25 +144,25 @@ sub name_exists {
 }
 
 sub post_addition {
-  my ($name, $data, $url) = @_;
+  my ($url, $ns, $name, $data) = @_;
   my $id = FreeToNormal($name);
-  print $q->p("Adding ", $q->a({-href=>$url}, $name));
+  print $q->p("Copying ", $q->a({-href=>$url}, "the blog post") . "…");
   my $text = "Based on [$url $name].\n----\n" . $data;
   my $ua = LWP::UserAgent->new;
   my %params = (text => $text,
 		title => $id,
 		summary => $name,
 		username => GetParam('username'),
+		ns => $ns,
 		pwd => GetParam('pwd'));
   $params{$QuestionaskerSecretKey} = 1 if $QuestionaskerSecretKey;
-  my $response = $ua->post($site, \%params);
+  my $response = $ua->post($FullUrl, \%params);
   if ($response->is_error) {
-    print $q->p("The submission failed!");
-    print $q->pre($response->status_line . "\n"
-		  . $response->content);
+    print $q->p("Copying failed!");
+    print $q->p($q->strong($response->status_line));
+    print $response->content;
   } else {
-    print $q->p("See for yourself: ",
-		$q->a({-href=>"$site/$id"}, $name));
+    print $q->p("Your copy: ", GetPageLink($name) . ".");
   }
 }
 
@@ -152,12 +173,22 @@ sub main {
     print "Content-type: text/plain; charset=UTF-8\r\n\r\n", <DATA>;
   } else {
     $UserGotoBar .= $q->a({-href=>$q->url . '/source'}, 'Source');
-    print GetHeader('', 'Submit a new blog article');
+    print GetHeader('', 'Copy a blog article');
     print $q->start_div({-class=>'content index'});
-    if (not GetParam('url')) {
-      default();
+    my $url = GetParam('url');
+    my $ns = GetParam('ns');
+    if (not $url or not $ns) {
+      default($url, $ns);
     } else {
-      check_url(GetParam('url'));
+      my ($name, $data) = get_data($url);
+      $name = GetParam('name', $name);
+      if (name_exists($name) and not GetParam('confirm', 0)) {
+	confirm_overwrite($url, $ns, $name);
+      } elsif (not GetParam('confirm', 0)) {
+	confirm_save($url, $ns, $name);
+      } else {
+	post_addition($url, $ns, $name, $data);
+      }
     }
     print $q->p('Questions? Send mail to Alex Schröder <'
 		. $q->a({-href=>'mailto:kensanata@gmail.com'},

contrib/campaignwiki/delete.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+if test -z "$2" -o ! -z "$3"; then
+    echo "Usage: delete.sh USERNAME WIKI"
+    exit 1
+fi
+
+username=$1
+wiki=$2
+
+for p in $(curl --silent "https://campaignwiki.org/wiki/$wiki?action=index;raw=1"); do
+    echo "Deleting: $p"
+    curl -F frodo=1 -F "title=$p" -F text=DeletedPage -F summary=Deleted -F username="$username" "https://campaignwiki.org/wiki/$wiki"
+    sleep 5
+done

contrib/campaignwiki/submit.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2010  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2010, 2012  Alex Schroeder <alex@gnu.org>
 
 # 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
@@ -17,6 +17,7 @@
 package OddMuse;
 use URI;
 use LWP::UserAgent;
+use utf8;
 
 # load Oddmuse core
 $RunCGI = 0;
@@ -61,16 +62,16 @@ sub parse_blogs {
   return %cached_blogs if %cached_blogs;
   my @data = split(/\n/, GetRaw($src));
   my $url;
-  my $name;
+  my $paramref;
   foreach $_ (@data) {
     if (/^\[(.+)\]/) {
       $url = $1;
-      $name = undef;
-    } elsif (/^name *= *(.+)/) {
-      $name = $1;
+      $paramref = {};
+    } elsif (/^([a-z_]+) *= *(.+)/) {
+      $paramref->{$1} = $2;
     }
-    if ($url && $name) {
-      $cached_blogs{$url} = $name;
+    if ($url && $paramref->{name}) {
+      $cached_blogs{$url} = $paramref;
     }
   }
   return %cached_blogs;
@@ -84,8 +85,16 @@ sub host_exists {
   }
 }
 
+sub debug_url {
+  my $url = $q->url(-path_info=>1) . "?debug=1;";
+  $url .= join(";", map { $_ . "=" . GetParam($_) }
+	       qw(username confirmed candidate url));
+  return $url;
+}
+
 sub check_url {
   my $url = shift;
+  print $q->p("Debug: url=$url") if GetParam("debug");
   my $frown = $q->img({-src=>"http://emacswiki.org/pics/smiles/sad.png",
 		       -alt=>":("});
   my $smile = $q->img({-src=>"http://emacswiki.org/pics/smiles/smile.png",
@@ -97,26 +106,24 @@ sub check_url {
     $u = URI->new($url);
     eval {$u->host };
   }
+
+  # - not an url
+  # - it's campaign wiki site
+  # - no username
+  # or read Feeds page and
+  #   - it's a duplicate
+  #   - it's a partial match: continue with confirmed=1
+  # or read the list of alternatives from the url
+  #     - one of the feeds listed is known: continue with confirmed=2
+  #     - no feeds were listed: url is a feed or report it
+  #     - one feed was listed: try it
+  #     - some feeds were listed: pick one
+
   if ($@) {
     # the prefixing of http:// above should make it really hard to reach this code
     print $q->p($q->a({-href=>$url}, $url) . qq{
 seems to be <strong>invalid</strong>. $frown Make sure you use something
 like the following: <tt>http://grognardia.blogspot.com/</tt>});
-  } elsif (not GetParam('username', '')) {
-    print $q->p(qq{As an anti-spam measure I'd really like you to <strong>provide a name</strong> for the log file. Sorry about that. $frown});
-  } else {
-    my %blogs = parse_blogs();
-    my $duplicate = host_exists($u->host, %blogs);
-    if ($duplicate
-	&& !$blogs{$url}
-	&& !GetParam('confirmed')) {
-      print $q->p("We have a partial match: ",
-		  $q->a({-href=>$duplicate}, $duplicate));
-      print GetFormStart();
-      print $q->hidden('confirmed', 1);
-      print $q->hidden('url', $url);
-      print $q->submit('go', 'Proceed anyway!');
-      print $q->end_form();
     } elsif ($url =~ /campaignwiki\.org/i) {
       print $q->p(qq{
 This looks <strong>familiar</strong>!
@@ -124,17 +131,35 @@ I do not think that adding any of the wikis on this site is the right
 thing to do, though.});
       print $q->p(qq{Thanks for testing it. }
 		  . $q->img({-src=>"http://www.emacswiki.org/pics/grin.png"}));
+  } elsif (not GetParam('username', '')) {
+    print $q->p(qq{As an anti-spam measure I'd really like you to
+<strong>provide a name</strong> for the log file. Sorry about that. $frown});
+  } else {
+    my %blogs = parse_blogs();
+    my $duplicate = host_exists($u->host, %blogs);
+    if ($blogs{$url}) {
+      print $q->p("We already list ",
+		  $q->a({-href=>$duplicate}, $duplicate));
+    } elsif ($duplicate	&& !GetParam('confirmed')) {
+      print $q->p("We have a partial match: ",
+		  $q->a({-href=>$duplicate}, $duplicate));
+      print GetFormStart();
+      print $q->hidden('confirmed', 1);
+      print $q->hidden('url', $url);
+      print $q->submit('go', 'Proceed anyway!');
+      print $q->end_form();
     } else {
-      my @alternatives = get_feeds($url, keys %blogs);
-      if ($#alternatives > 0 && !GetParam('candidate')) {
+      my ($status, @alternatives) = get_feeds($url, %blogs);
+      if ($status eq 'known' && GetParam('confirmed') < 2) {
+	print $q->p($q->a({-href=>$url},
+			  "The page you submitted")
+		    . " lists "
+		    . $q->a({-href=>$alternatives[0]},
+			    "a known feed") . ".");
 	print GetFormStart();
-	print $q->hidden('confirmed', 1);
+	print $q->hidden('confirmed', 2);
 	print $q->hidden('url', $url);
-	print $q->p("You need to pick one of the candidates:");
-	print $q->p(join($q->br(), map {
-	  $q->input({-type=>"radio", -name=>"candidate", -value=>$_},
-		    $q->a({-href=>$_}, QuoteHtml($_))) } @alternatives));
-	print $q->submit('go', 'Submit');
+	print $q->submit('go', 'Proceed anyway!');
 	print $q->end_form();
       } elsif ($#alternatives < 0) {
 	if (is_feed($url)) {
@@ -143,20 +168,31 @@ thing to do, though.});
 	  print $q->p("Apparently " . $q->a({-href=>$url}, QuoteHtml($url))
 		      . " is not a feed and doesn't link to any feed. "
 		      . "There is nothing for me to add. " . $frown);
+	  print $q->p("If you feel like it, you could try to "
+		      . $q->a({-href=>debug_url()}, "debug")
+		      . " this.");
 	}
+      } elsif ($#alternatives == 0) {
+	print $q->p($q->a({-href=>$url}, "The page you submitted")
+		    . " lists "
+		    . $q->a({-href=>$alternatives[0]},
+			    "one new feed")
+		    .  ".");
+	print GetFormStart();
+	print $q->hidden('url', $alternatives[0]);
+	print $q->submit('go', 'Take it!');
+	print $q->end_form();
+	print $q->p("If you feel like it, you could try to "
+		    . $q->a({-href=>debug_url()}, "debug")
+		    . " this.");
       } else {
-	my $candidate = GetParam('candidate');
-	$candidate = $alternatives[0] unless $candidate;
-	if (is_feed($candidate)) {
-	  post_addition($candidate);
-	} else {
-	  print $q->p($q->a({-href=>$candidate}, "The page you submitted")
-		      . " listed "
-		      . $q->a({-href=>$candidate}, QuoteHtml($candidate))
-		      . " as one of its feeds. "
-		      . "But it turns out that this is not a valid feed! "
-		      . "I can't add an invalid feed. " . $frown);
-	}
+	print GetFormStart();
+	print $q->p("You need to pick one of the candidates:");
+	print $q->p(join($q->br(), map {
+	  $q->input({-type=>"radio", -name=>"url", -value=>$_},
+		    $q->a({-href=>$_}, QuoteHtml($_))) } @alternatives));
+	print $q->submit('go', 'Submit');
+	print $q->end_form();
       }
     }
   }
@@ -172,23 +208,73 @@ sub is_feed {
 
 sub get_feeds {
   my $url = shift;
-  my %others = map { $_ => 1 } @_;
-  my @links = GetRaw($url) =~ /<link\b *(.*?)>/g;
+  my %others = @_;
+  my $html = GetRaw($url);
+  my @links = $html =~ /<link\b *(.*?)>/g;
+  print $q->p("Debug: " . scalar(@links) . " links found") if GetParam("debug");
+  print $q->pre($html) unless scalar(@links);
+  print $q->p("Debug: no content returned") if GetParam("debug") and not $html;
   my @feeds;
   foreach my $link (@links) {
-    my %link;
-    foreach (split(/ /, lc($link))) {
-      my ($attr, $val) = split(/=/, $_, 2);
-      # strip quotes and garbage: "foo"/ -> foo
-      my $to = index($val, substr($val, 0, 1), 1);
-      $val = substr($val, 1, $to -1) if $to >= 0;
-      $link{$attr} = $val;
+
+    print $q->p("Debug: $link")
+      if GetParam("debug");
+
+    if ($link !~ /\brel=(['"])alternate\1/i) {
+      print $q->p("Debug: missing rel='alternate'")
+	if GetParam("debug");
+      next;
     }
-    next unless $link{rel} eq 'alternate';
-    next unless $valid_content_type{$link{type}};
-    push(@feeds, $link{href}) unless $others{$link{href}};
+
+    $link =~ /\btype=(['"])(.*?)\1/i;
+    my $type = $2;
+    if (not $valid_content_type{$type}) {
+      print $q->p("Debug: type parameter is invalid ($type)")
+	if GetParam("debug");
+      next;
+    }
+
+    $link =~ /\bhref=(['"])(.*?)\1/i;
+    my $href = $2;
+    # clean up blogspot urls and prefer atom format
+    $href =~ s/\?alt=rss$//i if $href =~ /blogspot/i;
+    if (not $href) {
+      print $q->p("Debug: href missing")
+	if GetParam("debug");
+      next;
+    }
+    if ($others{$href}) {
+      print $q->p("Debug: feed already known ($href)")
+	if GetParam("debug");
+      if ($q->param('confirmed') >= 2) {
+	next;
+      } else {
+	# don't look for other alternatives!
+	return 'known', $href;
+      }
+    }
+
+    push(@feeds, $href);
   }
-  return @feeds;
+  print $q->p("Debug: returning " . scalar(@feeds) . " links found")
+    if GetParam("debug");
+  return 'ok', @feeds;
+}
+
+sub config {
+  my %blogs = @_;
+  my $result = qq{#! config file for the RPG Planet
+# format:
+# Feed URL in square brackets, followed by name = and the name of the feed
+};
+  foreach my $url (sort {lc($blogs{$a}->{name}) cmp lc($blogs{$b}->{name})} keys %blogs) {
+    $result .= "[$url]\n";
+    $paramref = $blogs{$url};
+    foreach my $key (sort keys %{$paramref}) {
+      $result .= $key . " = " . $paramref->{$key} . "\n";
+    }
+  }
+  return $result;
 }
 
 sub post_addition {
@@ -206,14 +292,9 @@ sub post_addition {
     $title = $final_url unless $title;
     print $q->p("Adding ",
 		$q->a({-href=>$final_url}, $title));
-    $blogs{$url} = $title;
-    my $result = qq{#! config file for the RPG Planet
-# format:
-# Feed URL in square brackets, followed by name = and the name of the feed
-};
-    foreach $url (sort {lc($blogs{$a}) cmp lc($blogs{$b})} keys %blogs) {
-      $result .= "[$url]\nname = " . $blogs{$url} . "\n";
-    }
+    my %param = (name => $title);
+    $blogs{$url} = \%param;
+    my $result = config(%blogs);
     my $ua = LWP::UserAgent->new;
     my %params = (text => $result,
 		  title => $page,
@@ -250,16 +331,18 @@ sub main {
   if ($q->path_info eq '/source') {
     seek DATA, 0, 0;
     print "Content-type: text/plain; charset=UTF-8\r\n\r\n", <DATA>;
+  } elsif ($q->path_info eq '/test') {
+    print "Content-type: text/plain; charset=UTF-8\r\n\r\n";
+    print config(parse_blogs());
   } else {
     $UserGotoBar .= $q->a({-href=>$q->url . '/source'}, 'Source');
     print GetHeader('', 'Submit a new blog');
     print $q->start_div({-class=>'content index'});
-    if (not GetParam('url')
-	or not GetParam($HoneyPotOk)) {
+    if (not GetParam('url')) {
+      print $q->p("Debug: no url parameter provided.") if GetParam("debug");
       default();
     } else {
       SetParam('title', 'Feeds'); # required to trigger HoneyPotInspection()
-      HoneyPotInspection();
       check_url(GetParam('url'));
     }
     print $q->p('Questions? Send mail to Alex Schröder <'

contrib/ell-to-wiki.pl

@@ -1,26 +1,20 @@
 #!/usr/bin/perl
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2004  Alex Schroeder <alex@emacswiki.org>
+# Copyright (C) 2004  Alex Schroeder <alex@gnu.org>
 # Copyright (C) 2007  Vinicius José Latorre <viniciusjl at ig.com.br>
 #
-# 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 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.
+# 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
-
-# $Id: ell-to-wiki.pl,v 1.5 2007/02/15 22:00:26 as Exp $
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
 
 use LWP::UserAgent;
 use XML::Parser;

contrib/fix-copyright-years

@@ -0,0 +1,122 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright 2006 Free Software Foundation, Inc.
+#
+# GNU Radio 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, or (at your option)
+# any later version.
+#
+# GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+# This file is based on code from GNU Radio.
+# https://github.com/balister/GNU-Radio/blob/master/dtools/bin/fix-copyright-years
+
+import re
+import datetime
+import subprocess
+import multiprocessing
+
+def command(*args): return subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0]
+
+def is_free_software(lines):
+    for line in lines[:50]:
+        if 'This program is free software' in line: return True
+    return False
+
+def get_copyright_lines(lines):
+    start = -1
+    end = -1
+    for i, line in enumerate(lines[:20]):
+        if line.startswith('# Copyright'):
+            if start == -1: start = i
+            end = i
+    if start == -1: raise Exception
+    return start, end
+
+def copyright_line(author, years):
+    from_year = years.pop()
+    to_year = from_year
+    for year in years:
+        if year > to_year: to_year = year
+        elif year < from_year: from_year = year
+
+    if from_year == to_year:
+        return '# Copyright (C) %d  %s\n' % (from_year, author)
+    else:
+        return '# Copyright (C) %d–%d  %s\n' % (from_year, to_year, author)
+
+author_re = re.compile('\nAuthor: (.*)\nDate:.* (\d\d\d\d) ')
+
+def fix_co_years(files):
+    for file in files:
+        print file
+        years = {}
+        changed = False
+        lines = open(file).readlines()
+        if not is_free_software(lines):
+            print '    is not Free Software'
+            continue
+
+        # extract authors and years from git log
+        log = command('git', 'log', file)
+        it = re.finditer(author_re, log)
+        for match in it:
+            author, year = match.groups()
+            if author in years:
+                years[author].add(int(year))
+            else:
+                years[author] = set([int(year)])
+                
+        # extract copyright beginning and end from 
+        try:
+            start, end = get_copyright_lines(lines)
+        except:
+            print '    copyright lines not found'
+            continue
+
+        # only update or add existing authors, don't touch authors not in git log
+        for author in years.keys():
+            found = False
+            for i in range(start, end + 1):
+                if author in lines[i]:
+                    line = copyright_line(author, years[author])
+                    if line != lines[i]:
+                        lines[i] = line
+                        changed = True
+                    found = True
+                    continue
+                
+            if not found:
+                lines.insert(end, copyright_line(author, years[author]))
+                changed = True
+
+        # write file
+        if changed:
+            # print ''.join(lines[:30])
+            # print '------------------------------------------------------------------------'
+            open(file, 'w').write(''.join(lines))
+
+if __name__ == "__main__":
+    # get recursive list of files in the repo
+    files = command('git', 'ls-tree', '--name-only', 'HEAD', '-r').splitlines()
+    # files = ['contrib/campaignwiki/add-link.pl']
+    
+    # start n+1 processes to handle the files
+    num_procs = multiprocessing.cpu_count()
+    # num_procs = 1
+    procs = [multiprocessing.Process(
+        target=lambda *files: fix_co_years(files),
+        args=files[num::num_procs],
+    ) for num in range(num_procs)]
+    map(multiprocessing.Process.start, procs)
+    map(multiprocessing.Process.join, procs)

contrib/info-ref

@@ -1,21 +1,17 @@
 #!/usr/bin/perl
-# Copyright (C) 2005, 2006, 2007  Alex Schroeder <alex@emacswiki.org>
+# Copyright (C) 2005, 2006, 2007, 2012  Alex Schroeder <alex@gnu.org>
 #
-# 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 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.
+# 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
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
 use warnings;
@@ -38,6 +34,42 @@ my %indexes = (
 	       => 'GNU Emacs Lisp reference manual, Index',
 	       'http://www.gnu.org/software/emacs/manual/html_node/elisp/index.html'
 	       => 'GNU Emacs Lisp reference manual, Top Menu',
+	       'http://www.gnu.org/software/emacs/manual/html_node/message/Index.html'
+	       => 'Message Manual, Index',
+	       'http://www.gnu.org/software/emacs/manual/html_node/gnus/Index.html'
+	       => 'The Gnus Newsreader, Index',
+	       'http://www.gnu.org/software/emacs/manual/html_node/cl/Function-Index.html'
+	       => 'Common Lisp Extensions, Function Index',
+	       'http://www.gnu.org/software/emacs/manual/html_node/ccmode/Variable-Index.html'
+	       => 'CC Mode Manual, Variable Index',
+	       'http://www.gnu.org/software/emacs/manual/html_node/ccmode/Concept-and-Key-Index.html'
+	       => 'CC Mode Manual, Command and Function Index',
+	       'http://www.gnu.org/software/emacs/manual/html_node/org/Index.html'
+	       => 'Org Mode Manual, Index',
+	       'http://www.gnu.org/software/auctex/manual/auctex/Function-Index.html'
+	       => 'AUCTeX Manual, Function Index',
+	       'http://www.gnu.org/software/auctex/manual/auctex/Variable-Index.html'
+	       => 'AUCTeX Manual, Variable Index',
+	       'http://www.gnu.org/software/auctex/manual/auctex/Concept-Index.html'
+	       => 'AUCTeX Manual, Concept Index',
+	       'http://www.gnu.org/software/texinfo/manual/texinfo/html_node/index.html'
+	       => 'Texinfo, Command and Variable Index',
+	       'http://www.gnu.org/software/texinfo/manual/texinfo/html_node/General-Index.html'
+	       => 'Texinfo, General Index',
+	       'http://www.gnu.org/software/texinfo/manual/info/html_node/Index.html'
+	       => 'Info, Index',
+	       'http://www.gnu.org/software/emacs/manual/html_node/dired-x/Command-Index.html'
+	       => 'Dired Extra, Function Index',
+	       'http://www.gnu.org/software/emacs/manual/html_node/dired-x/Variable-Index.html'
+	       => 'Dired Extra, Variable Index',
+	       'http://www.gnu.org/software/coreutils/manual/html_node/Concept-index.html'
+	       => 'Coreutils, Index',
+	       'http://www.gnu.org/software/diffutils/manual/html_node/Index.html'
+	       => 'Diffutils, Index',
+	       'http://www.gnu.org/software/findutils/manual/html_node/find_html/Primary-Index.html'
+	       => 'Findutils, Primary Index',
+	       'http://www.gnu.org/software/emacs/manual/html_node/ediff/Index.html'
+	       => 'Edfiff, Index',
 	      );
 
 my $db = '/org/org.emacswiki/htdocs/emacs/info-ref.dat';
@@ -63,7 +95,9 @@ sub ProcessRequest {
 sub ShowForm {
   print $q->header, $q->start_html,
     $q->start_form, "Index entry: ", $q->textfield('find'), $q->submit, $q->end_form,
-    $q->p('$Id: info-ref,v 1.1 2007/07/13 23:20:57 as Exp $'),
+    $q->p($q->a({-href=>"http://www.emacswiki.org/scripts/info-ref"}, "Source"), $q->br(),
+	  'Last DB update: ', TimeToText((stat($db))[9]),
+	  ' (' . $q->a({-href=>$q->url . '?init=1'}, "update") . ')'),
     $q->end_html;
 }
 
@@ -74,9 +108,11 @@ sub Find {
   foreach my $line (split(/$nl/, $data)) {
     my ($key, $rest) = split(/$fs/, $line);
     $map{$key} = ();
-    foreach my $a (split(/$gs/, $rest)) {
-      my ($link, $label) = split(/$rs/, $a);
-      $map{$key}{$link} = $label;
+    if ($rest) {
+      foreach my $a (split(/$gs/, $rest)) {
+	my ($link, $label) = split(/$rs/, $a);
+	$map{$key}{$link} = $label;
+      }
     }
   }
   my @links = keys %{$map{$str}};
@@ -150,7 +186,7 @@ sub GetRaw {
   return unless eval { require LWP::UserAgent; };
   my $ua = LWP::UserAgent->new;
   my $response = $ua->get($uri);
-  return $response->content;
+  return $response->decoded_content;
 }
 
 sub ReadFile {
@@ -189,3 +225,18 @@ sub ReportError { # fatal!
   print $q->start_html, $q->h2($errmsg), $q->end_html;
   exit (1);
 }
+
+sub CalcDay {
+  my ($sec, $min, $hour, $mday, $mon, $year) = gmtime(shift);
+  return sprintf('%4d-%02d-%02d', $year+1900, $mon+1, $mday);
+}
+
+sub CalcTime {
+  my ($sec, $min, $hour, $mday, $mon, $year) = gmtime(shift);
+  return sprintf('%02d:%02d UTC', $hour, $min);
+}
+
+sub TimeToText {
+  my $t = shift;
+  return CalcDay($t) . ' ' . CalcTime($t);
+}

contrib/localnames-server.pl

@@ -3,7 +3,7 @@
 #
 # 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
+# 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,
@@ -12,10 +12,7 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);

contrib/no-flickr.pl

@@ -0,0 +1,131 @@
+#! /usr/bin/perl -w
+
+# Copyright (C) 2005-2016  Alex Schroeder <alex@gnu.org>
+#
+# 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/>.
+
+use Modern::Perl;
+use LWP::UserAgent;
+use utf8;
+binmode(STDOUT, ":utf8");
+
+my $ua = LWP::UserAgent->new;
+
+sub url_encode {
+  my $str = shift;
+  return '' unless $str;
+  utf8::encode($str); # turn to byte string
+  my @letters = split(//, $str);
+  my %safe = map {$_ => 1} ('a' .. 'z', 'A' .. 'Z', '0' .. '9', '-', '_', '.', '!', '~', '*', "'", '(', ')', '#');
+  foreach my $letter (@letters) {
+    $letter = sprintf("%%%02x", ord($letter)) unless $safe{$letter};
+  }
+  return join('', @letters);
+}
+
+sub get_raw {
+  my $uri = shift;
+  my $response = $ua->get($uri);
+  return $response->content if $response->is_success;
+}
+
+sub get_wiki_page {
+  my ($wiki, $id, $password) = @_;
+  my $parameters = [
+    pwd => $password,
+    action => 'browse',
+    id => $id,
+    raw => 1,
+      ];
+  my $response = $ua->post($wiki, $parameters);
+  return $response->decoded_content if $response->is_success;
+  die "Getting $id returned " . $response->status_line;
+}
+
+sub get_wiki_index {
+  my $wiki = shift;
+  my $parameters = [
+    search => "flickr.com",
+    context => 0,
+    raw => 1,
+      ];
+  my $response = $ua->post($wiki, $parameters);
+  return $response->decoded_content if $response->is_success;
+  die "Getting the index returned " . $response->status_line;
+}
+
+sub post_wiki_page {
+  my ($wiki, $id, $username, $password, $text) = @_;
+  my $parameters = [
+    username => $username,
+    pwd => $password,
+    recent_edit => 'on',
+    text => $text,
+    title => $id,
+      ];
+  my $response = $ua->post($wiki, $parameters);
+  die "Posting to $id returned " . $response->status_line unless $response->code == 302;
+}
+
+my %seen = ();
+
+sub write_flickr {
+  my ($id, $flickr, $dir, $file) = @_;
+  say "Found $flickr";
+  warn "$file was seen before: " . $seen{$file} if $seen{$file};
+  die "$file contains unknown characters" if $file =~ /[^a-z0-9_.]/;
+  $seen{$file} = "$id used $flickr";
+  my $bytes = get_raw($flickr) or die("No data for $id");
+  open(my $fh, '>', "$dir/$file") or die "Cannot write $dir/$file";
+  binmode($fh);
+  print $fh $bytes;
+  close($fh);
+}
+
+sub convert_page {
+  my ($wiki, $pics, $dir, $username, $password, $id) = @_;
+  say $id;
+  my $text = get_wiki_page($wiki, $id, $password);
+  my $is_changed = 0;
+  while ($text =~ m!(https://[a-z0-9.]+.flickr.com/(?:[a-z0-9.]+/)?([a-z0-9_]+\.(?:jpg|png)))!) {
+    my $flickr = $1;
+    my $file = $2;
+    write_flickr($id, $flickr, $dir, $file);
+    $is_changed = 1;
+    my $re = quotemeta($flickr);
+    $text =~ s!$flickr!$pics/$file!g;
+  }
+  if ($is_changed) {
+    post_wiki_page($wiki, $id, $username, $password, $text);
+  } else {
+    # die "$id has no flickr matches?\n$text";
+  }
+  sleep(5);
+}
+
+sub convert_site {
+  my ($wiki, $pics, $dir, $username, $password) = @_;
+  my @ids = split(/\n/, get_wiki_index($wiki));
+  for my $id (@ids) {
+    convert_page($wiki, $pics, $dir, $username, $password, $id);
+  }
+}
+
+our $AdminPass;
+do "/home/alex/password.pl";
+convert_site('https://alexschroeder.ch/wiki',
+	     'https://alexschroeder.ch/pics',
+	     '/home/alex/alexschroeder.ch/pics',
+	     'Alex Schroeder',
+	     $AdminPass);

contrib/oddmuse_stats

@@ -0,0 +1,108 @@
+#!/usr/bin/perl -w
+# -*- perl -*-
+
+=head1 NAME
+
+oddmuse-stats - Plugin to monitor Oddmuse edits
+
+=head1 CONFIGURATION
+
+Set env.parent_dirs in the config file. The directories in this list
+are searched for data directories containing rc.log files. No
+whitespace in the directory names, sorry.
+
+Example:
+
+    [oddmuse_stats]
+    user www-data
+    env.parent_dirs /home/alex /home/alex/campaignwiki
+
+=head1 AUTHORS
+
+Original Author: Alex Schroeder
+
+=head1 LICENSE
+
+GPLv3
+
+=head1 MAGIC MARKERS
+
+ #%# family=auto
+ #%# capabilities=autoconf
+
+=cut
+
+use Munin::Plugin;
+use File::Basename;
+
+# The wiki directories may not contain any spaces.
+# Use the config file to set the environment variable!
+my @parent_dirs = ();
+my %logfiles = ();
+my %names = ();
+my $debug = $ENV{MUNIN_DEBUG};
+
+if ($ENV{'parent_dirs'}) {
+    @parent_dirs = split(/ /, $ENV{'parent_dirs'});
+} else {
+    die "The parent_dirs environment variable must be set.\n";
+}
+
+for my $parent_dir (@parent_dirs) {
+    warn "opening $parent_dir\n" if $debug;
+    if (opendir(my $dh, $parent_dir)) {
+	while(readdir $dh) {
+	    next if $_ eq '.' or $_ eq '..';
+	    if (-r "$parent_dir/$_/rc.log") {
+		my $basename = basename($_);
+		$names{clean_fieldname($basename)}
+		= $basename;
+		$logfiles{clean_fieldname($basename)}
+		= "$parent_dir/$_/rc.log";
+	    } else {
+		warn "discarding $_\n" if $debug;
+	    }
+	}
+	closedir $dh;
+    }
+}
+
+my $yesterday = time() - 86400;
+
+if ($ARGV[0]) {
+    if ($ARGV[0] eq 'autoconf') {
+	if (keys %logfiles) {
+	    print "yes\n";
+	    exit 0;
+	} else {
+	    print "no (no logfiles found in " . join(", ", @parent_dirs) . ")\n";
+	    exit 0;
+	}
+    } elsif ($ARGV[0] eq 'config') {
+	print "graph_title Oddmuse Wikis\n";
+	print "graph_category wikis\n";
+	print "graph_info This graph shows how many edits the wiki had in the last 24h.\n";
+	print "graph_vlabel edits/day\n";
+	print "graph_order";
+	for my $wiki (sort keys %logfiles) {
+	    print " $wiki";
+	};
+	print "\n";
+	for my $wiki (sort keys %logfiles) {
+	    my $name = $names{$wiki};
+	    print "$wiki.label $name\n";
+	}
+	exit 0;
+    }
+}
+
+for my $wiki (sort keys %logfiles) {
+    open (my $fh, '<', $logfiles{$wiki})
+	or die "cannot open " . $logfiles{$wiki} . ": $!";
+    my $value = 0;
+    while (<$fh>) {
+	my ($ts) = split(/\x1e/);
+	$value++ if $ts and $ts >= $yesterday;
+    }
+    print "$wiki.value $value\n";
+}

contrib/plinks.js

@@ -1,6 +1,9 @@
 /* Copyright 2005  Alex Schroeder <alex@emacswiki.org>
    based on http://simon.incutio.com/archive/2004/05/30/plinks#p-13
    Copyright 2004  Simon Willison
+
+   This script adds purple numbers to paragraphs.
+   https://oddmuse.org/wiki/Purple_Numbers_Extension
 */
 
 function plinkHighlight() {

contrib/simple-install/.cvsignore

@@ -1,5 +0,0 @@
-current.pl
-FDL
-GPL
-*.tar.gz
-*.tar.gz.sig

contrib/simple-install/.htaccess

@@ -1,17 +0,0 @@
-DirectoryIndex wiki.pl
-Options ExecCGI SymLinksIfOwnerMatch
-AddHandler cgi-script .pl
-
-<IfModule mod_rewrite.c>
-  RewriteEngine on
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteCond %{REQUEST_URI} !=/favicon.ico
-  RewriteRule ^(.*)$ wiki.pl?$1 [L,QSA]
-
-  # The config file might contain passwords. Also protect possible
-  # backup filenames.
-  RewriteRule ^config(\~|\.bak)?$ wiki.pl/config [L]
-  # The visitor.log file contains IP numbers of visitors.
-  RewriteRule ^visitors.log$ wiki.pl/visitor.log [L]
-</IfModule>

contrib/simple-install/Makefile

@@ -1,14 +0,0 @@
-all:
-	@echo Please invoke make dist on the top level
-
-%-simple.tar.gz: README config wiki.pl .htaccess current.pl FDL GPL
-	tar czf $@ $^
-
-current.pl: ../../wiki.pl
-	cp $^ $@
-
-FDL: ../../FDL
-	cp $^ $@
-
-GPL: ../../GPL
-	cp $^ $@

contrib/simple-install/README

@@ -1,76 +0,0 @@
-This is the README file distributed as part of the simple-install
-package together with the Oddmuse script.
-
-Unzip all the files into a directory served by Apache. Get the
-current.pl file from here: http://emacswiki.org/scripts/current.pl
-
-Your directory should now contain the following files:
-
-* README (this file)
-* .htaccess (information for Apache)
-* config (a simple config file for you to modify)
-* wiki.pl (a wrapper script setting the data directory)
-* current.pl (the main script)
-* modules (a directory containing modules)
-* modules/creole.pl (support for the standard wiki markup)
-
-The wiki pages will be saved in this directory.
-
-Make sure the www user (or whoever Apache runs under) has write access
-to this directory. In that directory, try chmod o+w . and see if that
-helps when you get an error message saying that Oddmuse cannot create
-the temp directory.
-
-You need to make sure that your administrator has allowed
-AllowOverride All in his httpd.conf file for the settings in the
-.htaccess file provided to have an effect.
-
-Running Oddmuse will create more files, eventually.
-
-* pages (the directory containing the pages)
-* keep (the directory containing older versions of pages)
-* pageidx (a file containing the names of existing pages)
-* rc.log (the file used to produce RecentChanges)
-* visitors.log (the file used to log the most recent visitors)
-* temp (a temporary directory for log files and the like)
-
-In order to start your wiki, click on the edit link (the first link
-below the navigation bar, at the bottom of the page).  This will allow
-you to enter some text for this page.  Click the Save button and you
-are done.
-
-To add new pages, edit the homepage and add links to new pages.  Links
-are traditionally formed by ConcatenatingCapitalizedWords.  This kind
-of link pattern is called a wiki word.
-
-Alternatively, put links in [[double square brackets]].  This kind of
-link pattern is called a free link.
-
-As long as the new pages don't exist, links to these pages are
-followed by a clickable question mark.  Click on the question mark to
-create the new page.
-
-Enjoy your wiki experience.
-
-Visit http://www.oddmuse.org/ to learn more about the translation
-files and modules that are part of this package.
-
-----------------------------------------------------------------------
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation.
-
-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.
-
-Both the GNU Free Documentation License, and the GNU General Public
-License are distributed together with this script.  See the files FDL
-and GPL, respectively.

contrib/simple-install/config

@@ -1,2 +0,0 @@
-# Where to find diff(1) and grep(1)
-$ENV{PATH} = '/usr/bin:/bin';

contrib/simple-install/wiki.pl

@@ -1,10 +0,0 @@
-#!/usr/bin/perl
-
-# This wrapper does nothing but tell Oddmuse to use the current
-# directory as its data directory.
-package OddMuse;
-$DataDir = '.';
-
-# You need to get the latest copy of this script from
-# http://emacswiki.org/scripts/current.pl
-do 'current.pl';

contrib/undo-double-quotes.pl

@@ -0,0 +1,114 @@
+#! /usr/bin/perl -w
+
+# Copyright (C) 2015  Alex Schroeder <alex@gnu.org>
+#
+# 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/>.
+
+use utf8;
+use strict;
+use warnings;
+undef $/; # slurp
+
+my %index = ();
+my $verbose = '';
+
+sub write_file {
+  my ($file, $data) = @_;
+  return unless $data;
+  open(my $fh, '>:utf8', $file) or die "Cannot write $file: $!";
+  print $fh $data;
+  close($fh);
+}  
+
+sub replacement_block {
+  my ($block, $pos, @no_go) = @_;
+
+  while (@no_go) {
+    my $first = shift @no_go;
+    print "Is $pos between " . $first->[0] . " and " . $first->[1] . "?\n" if $verbose;
+    return $block if $pos >= $first->[0] and $pos <= $first->[1];
+  }
+
+  return "";
+}
+
+sub translate_file {
+  my ($data) = @_;
+  my @no_go = ();
+
+  while ($data =~ /( <nowiki>.*?<\/nowiki>
+                   | <code>.*?<\/code>
+                   | ^ <pre> (.*\n)+ <\/pre>
+                   | ^ {{{ (.*\n)+ }}} )/gmx) {
+    push @no_go, [pos($data) - length $1, pos($data)];
+    print "no go from " . $no_go[-1]->[0] . ".." . $no_go[-1]->[1] . " for $1\n" if $verbose;
+  }
+
+  # The problem is that these replacements don't adjust @no_go! Perhaps it is good enough?
+  my $subs = '';
+  $subs = $subs || $data =~ s/ ( \[\/quote\] \n \n \[quote\] ) /replacement_block($1, pos($data), @no_go)/gex;
+  return $data if $subs;
+}
+
+sub read_file {
+  my $file = shift;
+  open(my $fh, '<:utf8', $file) or die "Cannot read $file: $!";
+  my $data = <$fh>;
+  close($fh);
+  return $data;
+}
+
+sub main {
+  my ($dir) = @_;
+  mkdir($dir . '-new') or die "Cannot create $dir-new: $!";
+  print "Indexing files\n";
+  foreach my $file (glob("$dir/.* $dir/*")) {
+    next unless $file =~ /$dir\/(.+)/;
+    my $id = $1;
+    next if $id eq ".";
+    next if $id eq "..";
+    $index{$id} = 1;
+  }
+  print "Converting files\n";
+  foreach my $id (sort keys %index) {
+    # this is where you debug a particular page
+    # $verbose = $id eq '2014-12-18_Emacs_Wiki_Migration';
+    write_file("$dir-new/$id", translate_file(read_file("$dir/$id")));
+  }
+}
+
+use Getopt::Long;
+
+my $dir = 'raw';
+my $help = '';
+
+GetOptions ("dir=s"    => \$dir,
+	    "help"     => \$help);
+
+if ($help) {
+  print qq{
+Usage: $0 [--dir=DIR]
+
+You need to use the raw.pl script to create a directory full of raw
+wiki text files.
+
+--dir=DIR is where the raw wiki text files are. Default: raw. The
+  converted files will be stored in DIR-new, ie. in raw-new by
+  default.
+
+Example: $0 --dir=~/alexschroeder/raw
+}
+} else {
+  main ($dir);
+}

contrib/undo-local-names.pl

@@ -0,0 +1,170 @@
+#! /usr/bin/perl -w
+
+# Copyright (C) 2015  Alex Schroeder <alex@gnu.org>
+#
+# 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/>.
+
+use utf8;
+use strict;
+use warnings;
+undef $/; # slurp
+
+my %index = ();
+my $verbose = '';
+
+my $LinkPattern = '(\p{Uppercase}+\p{Lowercase}+\p{Uppercase}\p{Alphabetic}*)';
+my $FreeLinkPattern = "([-,.()'%&?;<> _1-9A-Za-z\x{0080}-\x{fffd}]|[-,.()'%&?;<> _0-9A-Za-z\x{0080}-\x{fffd}][-,.()'%&?;<> _0-9A-Za-z\x{0080}-\x{fffd}]+)";
+my $UrlProtocols = 'http|https|ftp|afs|news|nntp|mid|cid|mailto|wais|prospero|telnet|gopher|irc|feed';
+my $UrlChars = '[-a-zA-Z0-9/@=+$_~*.,;:?!\'"()&#%]'; # see RFC 2396
+my $FullUrlPattern="((?:$UrlProtocols):$UrlChars+)"; # when used in square brackets
+
+# either a single letter, or a string that begins with a single letter and ends with a non-space
+my $words = '([A-Za-z\x{0080}-\x{fffd}](?:[-%.,:;\'"!?0-9 A-Za-z\x{0080}-\x{fffd}]*?[-%.,:;\'"!?0-9A-Za-z\x{0080}-\x{fffd}])?)';
+# zero-width assertion to prevent km/h from counting
+my $nowordstart = '(?:(?<=[^-0-9A-Za-z\x{0080}-\x{fffd}])|^)';
+# zero-width look-ahead assertion to prevent km/h from counting
+my $nowordend = '(?=[^-0-9A-Za-z\x{0080}-\x{fffd}]|$)';
+
+my $IrcNickRegexp = qr{[]a-zA-Z^[;\\`_{}|][]^[;\\`_{}|a-zA-Z0-9-]*};
+
+sub FreeToNormal {    # trim all spaces and convert them to underlines
+  my $id = shift;
+  return '' unless $id;
+  $id =~ s/ /_/g;
+  $id =~ s/__+/_/g;
+  $id =~ s/^_//;
+  $id =~ s/_$//;
+  return $id;
+}
+
+sub parse_local_names {
+  my $filename = shift;
+  print "Reading $filename\n";
+  open(my $fh, '<:utf8', $filename) or die "Cannot read $filename: $!";
+  my $data = <$fh>;
+  close($fh);
+  print "Parsing $filename\n";
+  my %names = ();
+  while ($data =~ m/\[$FullUrlPattern\s+([^\]]+?)\]/g) {
+    my ($page, $url) = ($2, $1);
+    my $id = FreeToNormal($page);
+    $names{$id} = $url;
+  }
+  return \%names;
+}
+
+sub write_file {
+  my ($file, $data) = @_;
+  return unless $data;
+  open(my $fh, '>:utf8', $file) or die "Cannot write $file: $!";
+  print $fh $data;
+  close($fh);
+}  
+
+sub replacement {
+  my ($names, $id, $pos, @no_go) = @_;
+
+  while (@no_go) {
+    my $first = shift @no_go;
+    print "Is $pos between " . $first->[0] . " and " . $first->[1] . "?\n" if $verbose;
+    return $id if $pos >= $first->[0] and $pos <= $first->[1];
+  }
+
+  return "[[$id]]" if exists $index{$id}; # local page exists
+  return $id unless $names->{$id};
+  return '[' . $names->{$id} . ' ' . $id . ']';
+}
+
+sub translate_file {
+  my ($names, $data) = @_;
+  my @no_go = ();
+
+  while ($data =~ /( <nowiki>.*?<\/nowiki>
+                   | <code>.*?<\/code>
+                   | ^ <pre> (.*\n)+ <\/pre>
+                   | ^ {{{ (.*\n)+ }}}
+                   | ${nowordstart} \* ${words} \* ${nowordend}
+                   | ${nowordstart} \/ ${words} \/ ${nowordend}
+                   | ${nowordstart} \_ ${words} \_ ${nowordend}
+                   | ${nowordstart} \! ${words} \! ${nowordend}
+                   | \[\[ $FreeLinkPattern .*? \]\]
+                   | \[ $FullUrlPattern \s+ [^\]]+? \]
+                   | ^( \h+.+\n )+
+                   | ^(?: \[? \d\d?:\d\d (?:am|pm)?  \]? )? \s* < $IrcNickRegexp > )/gmx) {
+    push @no_go, [pos($data) - length $1, pos($data)];
+    print "no go from " . $no_go[-1]->[0] . ".." . $no_go[-1]->[1] . " for $1\n" if $verbose;
+  }
+
+  my $subs = $data =~ s/(?<![:![])\b$LinkPattern(?![:])/replacement($names, $1, pos($data), @no_go)/ge;
+  return $data if $subs;
+}
+
+sub read_file {
+  my $file = shift;
+  open(my $fh, '<:utf8', $file) or die "Cannot read $file: $!";
+  my $data = <$fh>;
+  close($fh);
+  return $data;
+}
+
+sub main {
+  my ($dir, $local_names) = @_;
+  mkdir($dir . '-new') or die "Cannot create $dir-new: $!";
+  my $names = parse_local_names("$dir/$local_names");
+  print "Indexing files\n";
+  foreach my $file (glob("$dir/.* $dir/*")) {
+    next unless $file =~ /$dir\/(.+)/;
+    my $id = $1;
+    next if $id eq ".";
+    next if $id eq "..";
+    next if $id eq "$local_names";
+    $index{$id} = 1;
+  }
+  print "Converting files\n";
+  foreach my $id (sort keys %index) {
+    # this is where you debug a particular page
+    # $verbose = $id eq '2014-12-18_Emacs_Wiki_Migration';
+    write_file("$dir-new/$id", translate_file($names, read_file("$dir/$id")));
+  }
+}
+
+use Getopt::Long;
+
+my $names = 'LocalNames';
+my $dir = 'raw';
+my $help = '';
+
+GetOptions ("names=s"   => \$names,
+	    "dir=s"    => \$dir,
+	    "help"     => \$help);
+
+if ($help) {
+  print qq{
+Usage: $0 [--dir=DIR] [--names=LocalNames]
+
+You need to use the raw.pl script to create a directory full of raw
+wiki text files.
+
+--dir=DIR is where the raw wiki text files are. Default: raw. The
+  converted files will be stored in DIR-new, ie. in raw-new by
+  default.
+
+--names=LocalNames is the page name with all the local names on
+  it. Default: LocalNames
+
+Example: $0 --dir=~/alexschroeder/raw --names=Names
+}
+} else {
+  main ($dir, $names);
+}

contrib/undo-usemod.pl

@@ -0,0 +1,128 @@
+#! /usr/bin/perl -w
+
+# Copyright (C) 2015  Alex Schroeder <alex@gnu.org>
+#
+# 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/>.
+
+use utf8;
+use strict;
+use warnings;
+undef $/; # slurp
+
+my %index = ();
+my $verbose = '';
+
+sub write_file {
+  my ($file, $data) = @_;
+  return unless $data;
+  open(my $fh, '>:utf8', $file) or die "Cannot write $file: $!";
+  print $fh $data;
+  close($fh);
+}  
+
+sub replacement_block {
+  my ($block, $pos, @no_go) = @_;
+
+  while (@no_go) {
+    my $first = shift @no_go;
+    print "Is $pos between " . $first->[0] . " and " . $first->[1] . "?\n" if $verbose;
+    return $block if $pos >= $first->[0] and $pos <= $first->[1];
+  }
+
+  return "[quote]\n" . join("\n", split(/ \n :+ \h? /x, $block)) . "[/quote]\n";
+}
+
+sub replacement {
+  my ($block, $tag, $pos, @no_go) = @_;
+
+  while (@no_go) {
+    my $first = shift @no_go;
+    print "Is $pos between " . $first->[0] . " and " . $first->[1] . "?\n" if $verbose;
+    return $block if $pos >= $first->[0] and $pos <= $first->[1];
+  }
+
+  return $tag . $block . $tag;
+}
+
+sub translate_file {
+  my ($data) = @_;
+  my @no_go = ();
+
+  while ($data =~ /( <nowiki>.*?<\/nowiki>
+                   | <code>.*?<\/code>
+                   | ^ <pre> (.*\n)+ <\/pre>
+                   | ^ {{{ (.*\n)+ }}} )/gmx) {
+    push @no_go, [pos($data) - length $1, pos($data)];
+    print "no go from " . $no_go[-1]->[0] . ".." . $no_go[-1]->[1] . " for $1\n" if $verbose;
+  }
+
+  # The problem is that these replacements don't adjust @no_go! Perhaps it is good enough?
+  my $subs = '';
+  $subs = $subs || $data =~ s/ ''' (.*?) ''' /replacement($1, '**', pos($data), @no_go)/gxe;
+  $subs = $subs || $data =~ s/  '' (.*?) ''  /replacement($1, '\/\/', pos($data), @no_go)/gxe;
+  $subs = $data =~ s/ ^ :+ \h? ( .* \n (?: .+ \n ) * ) /replacement_block($1, pos($data), @no_go)/gmxe;
+  return $data if $subs;
+}
+
+sub read_file {
+  my $file = shift;
+  open(my $fh, '<:utf8', $file) or die "Cannot read $file: $!";
+  my $data = <$fh>;
+  close($fh);
+  return $data;
+}
+
+sub main {
+  my ($dir) = @_;
+  mkdir($dir . '-new') or die "Cannot create $dir-new: $!";
+  print "Indexing files\n";
+  foreach my $file (glob("$dir/.* $dir/*")) {
+    next unless $file =~ /$dir\/(.+)/;
+    my $id = $1;
+    next if $id eq ".";
+    next if $id eq "..";
+    $index{$id} = 1;
+  }
+  print "Converting files\n";
+  foreach my $id (sort keys %index) {
+    # this is where you debug a particular page
+    # $verbose = $id eq '2014-12-18_Emacs_Wiki_Migration';
+    write_file("$dir-new/$id", translate_file(read_file("$dir/$id")));
+  }
+}
+
+use Getopt::Long;
+
+my $dir = 'raw';
+my $help = '';
+
+GetOptions ("dir=s"    => \$dir,
+	    "help"     => \$help);
+
+if ($help) {
+  print qq{
+Usage: $0 [--dir=DIR]
+
+You need to use the raw.pl script to create a directory full of raw
+wiki text files.
+
+--dir=DIR is where the raw wiki text files are. Default: raw. The
+  converted files will be stored in DIR-new, ie. in raw-new by
+  default.
+
+Example: $0 --dir=~/alexschroeder/raw
+}
+} else {
+  main ($dir);
+}

control

@@ -1,14 +0,0 @@
-Maintainer: Alex Schroeder <alex@oddmuse.org>
-Section: web
-Priority: optional
-Standards-Version: 3.5.10
-
-Package: oddmuse
-Architecture: any
-Depends: httpd, perl5, perl-modules
-Suggests: libwww-perl, libxml-rss-perl, libmime-base64-perl, diff
-Description: wiki engine
-  A "wiki" is a website that is usally collaboratively edited
-  by its users, including the ability to alter text written by
-  other users.  It is a simple and efficient content management
-  system (CMS).

css/alex-2012.css

@@ -1,15 +1,18 @@
+@font-face {
+	  font-family: 'Garamond';
+	  font-style: normal;
+	  font-weight: 400;
+	  src: local('Garamond'), local('GaramondNo8'), local('EB Garamond'), local('EBGaramond'), url(https://themes.googleusercontent.com/static/fonts/ebgaramond/v4/kYZt1bJ8UsGAPRGnkXPeFdIh4imgI8P11RFo6YPCPC0.woff) format('woff');
+}
+
 body, rss {
-    font-family: Garamond, GaramondNo8, "Bookman Old Style", Cochin, Baskerville, serif;
+    font-family: Garamond, serif;
     font-size: 16pt;
     line-height: 20pt;
     margin:1em 3em;
     padding:0;
 }
 
-body.sans {
-    font-family: Franklin Gothic Book, Corbel, Arial, sans-serif;
-}
-
 /* headings: we can use larger sizes if we use a lighter color.
    we cannot inherit the font-family because header and footer use a narrow font. */
 
@@ -71,6 +74,55 @@ h1 a:visited, h2 a:visited, h3 a:visited {
     color: inherit;
 }
 
+/* for download buttons and the like */
+
+.button {
+    display: inline-block;
+    font-size: 120%;
+    cursor: pointer;
+    padding: 0.4em 0.6em;
+    text-shadow: 0px -1px 0px #ccc;
+    background-color: #cfa;
+    border: 1px solid #9d8;
+    border-radius: 5px;
+    box-shadow: 0px 1px 3px white inset, 0px 1px 3px black;
+}
+
+.button .icon {
+    color: #363;
+    text-shadow: 0px -1px 1px white, 0px 1px 3px #666;
+}
+
+.button a {
+    text-decoration: none;
+    font-weight: normal;
+}
+
+/* links */
+
+a.pencil {
+    padding-left: 1ex;
+    text-decoration: none;
+    color: inherit;
+    visible: hidden;
+    transition: visibility 0s 1s, opacity 1s linear;
+    opacity: 0;
+}
+*:hover > a.pencil {
+    visible: visible;
+    transition: opacity .5s linear;
+    opacity: 1;
+}
+@media print {
+    a.pencil {
+	display: none;
+    }
+}
+
+a.number {
+    text-decoration: none;
+}
+
 /* stop floating content from flowing over the footer */
 
 hr {
@@ -107,6 +159,15 @@ pre, code, tt {
     line-height: 110%;
 }
 
+pre {
+    overflow:hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
 /* styling for divs that will be invisible when printing
    when printing. */
 
@@ -149,9 +210,6 @@ div.refer {
     line-height:   13pt;
 }
 
-div.refer a:first-child:before { content: "" }
-div.refer a:before { content: "• " }
-
 div.message {
     background-color:#fee;
     color:#000;
@@ -179,7 +237,6 @@ div.sister hr {
 }
 div.sister img {
     border:none;
-    background-color:#ffe;
 }
 
 div.near, div.definition {
@@ -197,9 +254,6 @@ div.sidebar ul {
 
 /* replacements, features */
 
-del {
-    color: #666;
-}
 ins {
     color: #b33;
     text-decoration: none;
@@ -232,9 +286,15 @@ div.commentshown {
 p.comment {
     margin-bottom: 0;
 }
+div.comment {
+    font-size: 14pt;
+}
+div.comment h2 {
+    margin-top: 5em;
+}
 /* comment pages with username, homepage, and email subscription */
-.comment span { display: block; }
-.comment span label { display: inline-block; width: 10em; }
+.comment form span { display: block; }
+.comment form span label { display: inline-block; width: 10em; }
 /* IE sucks */
 .comment input#username,
 .comment input#homepage,
@@ -334,8 +394,13 @@ div.image span.caption {
     margin: 0 1em;
 }
 
+img {
+    max-width: 100%;
+}
+
 .left { float:left; margin-right: 1em; }
 .right { float:right; margin-left: 1em; }
+.half a img { height: 50%; width: 50%; }
 div.left .left, div.right .right {
     float:none;
 }
@@ -383,78 +448,78 @@ div.left p + p { display:table-caption; caption-side:bottom; }
 p.table a { float:left; width:20ex; }
 p.table + p { clear:both; }
 
+/* no bleeding
 @media screen {
-    /* no bleeding */
     div.content, div.rc {
 	overflow:hidden;
     }
-}
+} */
 
 @media print {
     body {
-	font-size:   12pt;
-	line-height: 13pt;
-	color:       #000;
-	background-color: #fff;
-    }
+		font-size:   12pt;
+		line-height: 13pt;
+		color:       #000;
+		background-color: #fff;
+	}
     
     /* hide all the crap */
     div.diff, div.diff+hr, div.refer, div.near, div.definition, div.sister,
     div.cal, div.footer, span.specialdays, span.gotobar, a.edit, a.number span,
-    div.rc form, form.tiny, p.comment {
-	display:none;
+    div.rc form, form.tiny, p.comment, p#plus1, div.g-plusone {
+		display:none;
     }
     a,
     a:visited,
     div.content a.near:link, 
     div.content a.near:visited,
     div.content a.near:active {
-	color:inherit;
-	font-weight: bold;
+		color:inherit;
+		font-weight: bold;
     }
     div.content a.feed {
-	display: none;
+		display: none;
     }
     div.content a.book,
     div.content a.movie {
-	text-decoration: none;
+		text-decoration: none;
     }
     a cite {
-	font-style: italic;
+		font-style: italic;
     }
     /* no difference */
     pre, code, tt {
-	font-size: inherit;
-	line-height: inherit;
+		font-size: inherit;
+		line-height: inherit;
     }
     /* no dotted underlines */ 
     acronym, abbr {
-	border: none;
-	text-decoration: none;
+		border: none;
+		text-decoration: none;
     }
     /* headings */
     h1 {
-	color:       inherit;
-	margin-top:  2em;
-    }
-    h2 {
-	color:inherit;
-	margin: 1em 0;
-	font-variant: small-caps;
-    }
-    h3 {
-	font-weight:inherit;
-	font-style:italic;
-	color:inherit;
-	margin: 1em 0;
-    }
-    h1 a, h2 a, h3 a {
-	color: inherit;
-    }
-    div.journal h1 a:visited,
-    div.journal h2 a:visited,
-    div.journal h3 a:visited {
-	color: inherit;
+		color:       inherit;
+		margin-top:  2em;
+	}
+	h2 {
+		color:inherit;
+		margin: 1em 0;
+		font-variant: small-caps;
+	}
+	h3 {
+		font-weight:inherit;
+		font-style:italic;
+		color:inherit;
+		margin: 1em 0;
+	}
+	h1 a, h2 a, h3 a {
+		color: inherit;
+	}
+	div.journal h1 a:visited,
+	div.journal h2 a:visited,
+	div.journal h3 a:visited {
+		color: inherit;
     }
 }
 

css/alex-2014.css

@@ -0,0 +1,632 @@
+/* font-face includes TTF for PDF generation */
+
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff') url('/fonts/NoticiaText-Regular.ttf') format('truetype');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff') url('/fonts/NoticiaText-Regular.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Noticia Text'), local('NoticiaText-Regular)'), url('/fonts/NoticiaText-Regular.woff') format('woff') url('/fonts/NoticiaText-Regular.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff') url('/fonts/NoticiaText-Bold.ttf') format('truetype');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff') url('/fonts/NoticiaText-Bold.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Noticia Text Bold'), local('NoticiaText-Bold)'), url('/fonts/NoticiaText-Bold.woff') format('woff') url('/fonts/NoticiaText-Bold.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff') url('/fonts/NoticiaText-Italic.ttf') format('truetype');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff') url('/fonts/NoticiaText-Italic.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Noticia Text Italic'), local('NoticiaText-Italic)'), url('/fonts/NoticiaText-Italic.woff') format('woff') url('/fonts/NoticiaText-Italic.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff') url('/fonts/NoticiaText-BoldItalic.ttf') format('truetype');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff') url('/fonts/NoticiaText-BoldItalic.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Noticia Text';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Noticia Text Bold Italic'), local('NoticiaText-BoldItalic)'), url('/fonts/NoticiaText-BoldItalic.woff') format('woff') url('/fonts/NoticiaText-BoldItalic.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+
+@font-face {
+  font-family: 'Symbola';
+  src: local('Symbola'), url('/fonts/Symbola.woff') format('woff') url('/fonts/Symbola.ttf') format('truetype');
+}
+
+body, rss {
+    font-family: "Noticia Text", Symbola, serif;
+    font-style: normal;
+    font-size: 14pt;
+    margin: 1em 3em;
+    padding:0;
+}
+
+@media print {
+    body {
+	font-size: 12pt;
+	color: #000;
+	background-color: #fff;
+    }
+    
+    /* hide all the crap */
+    div.diff, div.diff+hr, div.refer, div.near, div.definition, div.sister,
+    div.cal, div.footer, span.specialdays, span.gotobar, a.edit, a.number span,
+    div.rc form, form.tiny, p.comment, p#plus1, div.g-plusone, div.content a.feed {
+	display:none;
+    }
+    div.content a.book,
+    div.content a.movie {
+	text-decoration: none;
+    }
+    a cite {
+	font-style: italic;
+    }
+    img[alt="RSS"] { display: none }
+    a.rss { font-size: 8pt }
+}
+
+/* headings: we can use larger sizes if we use a lighter color.
+   we cannot inherit the font-family because header and footer use a narrow font. */
+
+h1, h2, h3, title {
+    font-family: inherit;
+    font-weight: normal;
+}
+h1, channel title {
+    font-size: 32pt;
+    margin: 1em 0 0.5em 0;
+    padding: 0.4em 0;
+}
+h2 {
+    font-size: 18pt;
+    margin: 2em 0 0 0;
+    padding: 0;
+}
+h3 {
+    font-size: inherit;
+    font-weight: bold;
+    padding: 0;
+    margin: 1em 0 0 0;
+    clear: both;
+}
+
+/* headers in the journal are smaller */
+
+div.journal h1, item title {
+    font-size: inherit;
+    padding: 0;
+    clear: both;
+    border-bottom: 1px solid #000;
+}
+div.journal h2 {
+    font-family: inherit;
+    font-size: inherit;
+}
+div.journal h3 {
+    font-family: inherit;
+    font-size: inherit;
+    font-weight: inherit;
+    font-style: italic;
+}
+div.journal hr {
+    visibility: hidden;
+}
+p.more {
+    margin-top: 3em;
+}
+/* Links in headings appear on journal pages. */
+
+h1 a, h2 a, h3 a {
+    color:inherit;
+    text-decoration:none;
+    font-weight: normal;
+} 
+h1 a:visited, h2 a:visited, h3 a:visited {
+    color: inherit;
+}
+
+/* for download buttons and the like */
+
+.button {
+    display: inline-block;
+    font-size: 120%;
+    cursor: pointer;
+    padding: 0.4em 0.6em;
+    text-shadow: 0px -1px 0px #ccc;
+    background-color: #cfa;
+    border: 1px solid #9d8;
+    border-radius: 5px;
+    box-shadow: 0px 1px 3px white inset, 0px 1px 3px black;
+}
+
+.button .icon {
+    color: #363;
+    text-shadow: 0px -1px 1px white, 0px 1px 3px #666;
+}
+
+.button a {
+    text-decoration: none;
+    font-weight: normal;
+}
+
+/* links */
+
+a.pencil {
+    padding-left: 1ex;
+    text-decoration: none;
+    color: inherit;
+    visibility: hidden;
+    transition: visibility 0s 1s, opacity 1s linear;
+    opacity: 0;
+}
+*:hover > a.pencil {
+    visibility: visible;
+    transition: opacity .5s linear;
+    opacity: 1;
+}
+@media print {
+    a.pencil {
+	display: none;
+    }
+}
+
+a.number {
+    text-decoration: none;
+}
+
+/* stop floating content from flowing over the footer */
+
+hr {
+    clear: both;
+}
+
+/* the distance between links in the navigation bars */
+
+span.bar a {
+    margin-right: 1ex;
+}
+
+a img {
+    border: none;
+}
+
+/* search box in the top bar */
+
+.header form, .header p {
+    display: inline;
+    white-space: nowrap;
+}
+label[for="searchlang"], #searchlang, .header input[type="submit"] {
+    /* don't use display: none! http://stackoverflow.com/questions/5665203/getting-iphone-go-button-to-submit-form */
+    visibility: hidden; position: absolute;
+}
+/* wrap on the iphone */
+@media media only screen and (max-device-width: 480px) {
+}
+
+.header input {
+    width: 10ex;
+}
+
+/* other form fields */
+
+input[type="text"] {
+    padding: 0;
+    font-size: 80%;
+    line-height: 125%;
+}
+
+/* code */
+
+textarea, pre, code, tt {
+    font-family: "Andale Mono", Monaco, "Courier New", Courier, monospace, "Symbola";
+    font-size: 80%;
+}
+
+pre {
+    overflow:hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
+/* styling for divs that will be invisible when printing
+   when printing. */
+
+div.header, div.footer, div.near, div.definition, p.comment, a.tag {
+    
+    font-size: 14pt;
+}
+@media print {
+    div.header, div.footer, div.near, div.definition, p.comment, a.tag {
+	font-size: 8pt;
+    }
+}
+
+div.footer form.search {
+    display: none;
+}
+div.rc li + li {
+    margin-top: 1em;
+}
+div.rc li strong, table.history strong, strong.description {
+    font-family: inherit;
+    font-weight: inherit;
+}
+div.diff {
+    padding-left: 5%;
+    padding-right: 5%;
+    font-size: 12pt;
+    color: #000;
+
+}
+div.old {
+    background-color: #ffffaf;
+}
+div.new {
+    background-color: #cfffcf;
+}
+
+div.refer {
+    padding-left: 5%;
+    padding-right: 5%;
+    font-size: 12pt;
+}
+
+div.message {
+    background-color:#fee;
+    color:#000;
+}
+
+img.xml {
+    border:none;
+    padding:1px;
+}
+a.small img {
+    max-width:300px;
+}
+a.large img {
+    max-width:600px;
+}
+div.sister {
+    margin-right:1ex;
+    background-color:inherit;
+}
+div.sister p {
+    margin-top:0;
+}
+div.sister hr {
+    display:none;
+}
+div.sister img {
+    border:none;
+}
+
+div.near, div.definition {
+    background-color:#efe;
+}
+
+div.sidebar {
+    float:right;
+    border:1px dotted #000;
+    padding:0 1em;
+}
+div.sidebar ul {
+    padding-left:1em;
+}
+
+/* replacements, features */
+
+ins {
+    color: #b33;
+    text-decoration: none;
+}
+acronym, abbr {
+    letter-spacing:0.1em;
+    font-variant:small-caps;
+}
+
+/* Interlink prefix not shown */
+a .site, a .separator {
+        display: none;
+}
+a cite { font:inherit; }
+/* browser borkage */
+textarea[name="text"] { width:97%; height:80%; }
+textarea[name="summary"] { width:97%; height:3em; }
+/* comments */
+textarea[name="aftertext"] { width:97%; height:10em; }
+div.commentshown {
+    font-size: 12pt;
+    padding: 2em 0;
+}
+div.commenthidden {
+    display:none;
+}
+div.commentshown {
+    display:block;
+}
+p.comment {
+    margin-bottom: 0;
+}
+div.comment {
+    font-size: 14pt;
+}
+div.comment h2 {
+    margin-top: 5em;
+}
+/* comment pages with username, homepage, and email subscription */
+.comment form span { display: block; }
+.comment form span label { display: inline-block; width: 10em; }
+/* IE sucks */
+.comment input#username,
+.comment input#homepage,
+.comment input#mail { width: 20em; }
+
+/* cal */
+div.month { padding:0; margin:0 2ex; }
+body > div.month {
+    float:right;
+    background-color: inherit;
+    border:solid thin;
+    padding:0 1ex;
+}
+div.year > div.month {
+    float:left;
+}
+div.footer {
+    clear:both;
+}
+div.content div.month a.edit {
+    color:inherit;
+    font-weight:inherit;
+    text-decoration: none;
+}
+
+/* history tables and other tables */
+table.history {
+    border: none;
+}
+td.history {
+    border: none;
+}
+
+table.user {
+    border: none;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    padding: 1em;
+    margin: 1em 2em;
+}
+table.user tr td, table.user tr th {
+    border: none;
+    padding: 0.2em 0.5em;
+    vertical-align: top;
+}
+table.arab tr th {
+    font-weight:normal;
+    text-align:left;
+    vertical-align:top;
+}
+table.arab, table.arab tr th, table.arab tr td {
+    border:none;
+}
+th.nobreak {
+    white-space:nowrap;
+}
+table.full { width:99%; margin-left:1px; }
+table.j td, table.j th, table tr td.j, table tr th.j, .j { text-align:justify; }
+table.l td, table.l th, table tr td.l, table tr th.l, .l { text-align:left; }
+table.r td, table.r th, table tr td.r, table tr th.r, .r { text-align:right; }
+table.c td, table.c th, table tr td.c, table tr th.c, .c { text-align:center; }
+table.t td { vertical-align: top; }
+td.half { width:50%; }
+td.third { width:33%; }
+
+form table td { padding:5px; }
+
+/* lists */
+dd { padding-bottom:0.5ex; }
+dl.inside dt { float:left; }
+/* search */
+div.search span.result { font-size:larger; }
+div.search span.info { font-size:smaller; font-style:italic; }
+div.search p.result { display:none; }
+
+img.logo {
+    float: right;
+    margin: 0 0 0 1ex;
+    padding: 0;
+    border: 1px solid #000;
+    opacity: 0.3;
+    background-color:#ffe;
+}
+
+/* images */
+
+div.content a.feed img, div.journal a.feed img,
+div.content a img.smiley, div.journal a img.smiley, img.smiley,
+div.content a.inline img, div.journal a.inline img,
+div.content li a.image img, div.journal li a.image img { 
+    margin: 0; padding: 0; border: none;
+}
+div.image a img {
+    margin-bottom: 0;
+}
+div.image span.caption {
+    margin: 0 1em;
+}
+
+img {
+    max-width: 100%;
+}
+
+.left { float:left; margin-right: 1em; }
+.right { float:right; margin-left: 1em; }
+.half a img { height: 50%; width: 50%; }
+div.left .left, div.right .right {
+    float:none;
+}
+.center { text-align:center; }
+table.aside {
+    float:right;
+    width:40%;
+    margin-left: 1em;
+    padding: 1ex;
+    border: 1px dotted #666;
+}
+table.aside td {
+    text-align:left;
+}
+div.sidebar {
+    float:right; width: 250px;
+    text-align: right;
+    border: none;
+    margin: 1ex;
+}
+
+.bigsidebar {
+    float:right;
+    width: 500px;
+    border: none;
+    margin-left: 1ex;
+    font-size: 80%;
+}
+
+dl.irc dt { width:20ex; float:left; text-align:right; clear:left; }
+dl.irc dt span.time { float:left; }
+dl.irc dd { margin-left:22ex; }
+
+/* portrait */
+
+div.footer, div.comment, hr { clear: both; }
+.portrait { float: left; font-size: small; margin-right: 1em; }
+.portrait a { color: #999; }
+
+div.left { float:left; margin:1em; padding: 0.5em; }
+div.left p { display:table-cell; }
+div.left p + p { display:table-caption; caption-side:bottom; }
+
+p.table a { float:left; width:20ex; }
+p.table + p { clear:both; }
+
+/* no bleeding
+@media screen {
+    div.content, div.rc {
+	overflow:hidden;
+    }
+} */
+
+/* rss */
+
+channel * { display: block; }
+
+channel title {
+    margin-top: 30pt;
+}
+copyright {
+    font-size: 14pt;
+    margin-top: 1em;
+}
+channel > link:before {
+    font-size: 18pt;
+    display: block;
+    margin: 1em;
+    padding: 0.5em;
+    content: "This is an RSS feed, designed to be read in a feed reader.";
+    color: red;
+    border: 1px solid red;
+}
+link, license {
+    font-size: 11pt;
+    margin-bottom: 9pt;
+}
+username:before { content: "Last edited by "; }
+username:after { content: "."; }
+generator:before { content: "Feed generated by "; }
+generator:after { content: "."; }
+channel description {
+    font-weight: bold;
+}
+item description {
+    font-style: italic;
+    font-weight: normal;
+    margin-bottom: 1em;
+}
+docs, language,
+pubDate, lastBuildDate, ttl, guid, category, comments,
+docs, image title, image link,
+status, version, diff, history, importance {
+    display: none;
+}

css/alex-2015.css

@@ -0,0 +1,539 @@
+/* This file is in the public domain. */
+
+body, rss {
+    font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+    font-style: normal;
+    font-size: 14pt;
+    margin: 1em 3em;
+    padding:0;
+}
+
+@media print {
+    body {
+	font-size: 12pt;
+	color: #000;
+	background-color: #fff;
+    }
+    
+    /* hide all the crap */
+    div.diff, div.diff+hr, div.refer, div.near, div.definition, div.sister,
+    div.cal, div.footer, span.specialdays, span.gotobar, a.edit, a.number span,
+    div.rc form, form.tiny, p.comment, p#plus1, div.g-plusone, div.content a.feed {
+	display:none;
+    }
+    div.content a.book,
+    div.content a.movie {
+	text-decoration: none;
+    }
+    a cite {
+	font-style: italic;
+    }
+    img[alt="RSS"] { display: none }
+    a.rss { font-size: 8pt }
+}
+
+/* headings: we can use larger sizes if we use a lighter color.
+   we cannot inherit the font-family because header and footer use a narrow font. */
+
+h1, h2, h3, title {
+    font-family: inherit;
+    font-weight: normal;
+}
+h1, channel title {
+    font-size: 32pt;
+    margin: 1em 0 0.5em 0;
+    padding: 0.4em 0;
+}
+h2 {
+    font-size: 18pt;
+    margin: 2em 0 0 0;
+    padding: 0;
+}
+h3 {
+    font-size: inherit;
+    font-weight: bold;
+    padding: 0;
+    margin: 1em 0 0 0;
+    clear: both;
+}
+
+/* headers in the journal are smaller */
+
+div.journal h1, item title {
+    font-size: inherit;
+    padding: 0;
+    clear: both;
+    border-bottom: 1px solid #000;
+}
+div.journal h2 {
+    font-family: inherit;
+    font-size: inherit;
+}
+div.journal h3 {
+    font-family: inherit;
+    font-size: inherit;
+    font-weight: inherit;
+    font-style: italic;
+}
+div.journal hr {
+    visibility: hidden;
+}
+p.more {
+    margin-top: 3em;
+}
+/* Links in headings appear on journal pages. */
+
+h1 a, h2 a, h3 a {
+    color:inherit;
+    text-decoration:none;
+    font-weight: normal;
+} 
+h1 a:visited, h2 a:visited, h3 a:visited {
+    color: inherit;
+}
+
+/* for download buttons and the like */
+
+.button {
+    display: inline-block;
+    font-size: 120%;
+    cursor: pointer;
+    padding: 0.4em 0.6em;
+    text-shadow: 0px -1px 0px #ccc;
+    background-color: #cfa;
+    border: 1px solid #9d8;
+    border-radius: 5px;
+    box-shadow: 0px 1px 3px white inset, 0px 1px 3px black;
+}
+
+.button .icon {
+    color: #363;
+    text-shadow: 0px -1px 1px white, 0px 1px 3px #666;
+}
+
+.button a {
+    text-decoration: none;
+    font-weight: normal;
+}
+
+/* links */
+
+a.pencil {
+    padding-left: 1ex;
+    text-decoration: none;
+    color: inherit;
+    visibility: hidden;
+    transition: visibility 0s 1s, opacity 1s linear;
+    opacity: 0;
+}
+*:hover > a.pencil {
+    visibility: visible;
+    transition: opacity .5s linear;
+    opacity: 1;
+}
+@media print {
+    a.pencil {
+	display: none;
+    }
+}
+
+a.number {
+    text-decoration: none;
+}
+
+/* stop floating content from flowing over the footer */
+
+hr {
+    clear: both;
+}
+
+/* the distance between links in the navigation bars */
+
+span.bar a {
+    margin-right: 1ex;
+}
+
+a img {
+    border: none;
+}
+
+/* search box in the top bar */
+
+.header form, .header p {
+    display: inline;
+    white-space: nowrap;
+}
+label[for="searchlang"], #searchlang, .header input[type="submit"] {
+    /* don't use display: none! http://stackoverflow.com/questions/5665203/getting-iphone-go-button-to-submit-form */
+    visibility: hidden; position: absolute;
+}
+/* wrap on the iphone */
+@media only screen and (max-device-width: 480px) {
+}
+
+.header input {
+    width: 10ex;
+}
+
+/* other form fields */
+
+input[type="text"] {
+    padding: 0;
+    font-size: 80%;
+    line-height: 125%;
+}
+
+/* code */
+
+textarea, pre, code, tt {
+    font-family: "Andale Mono", Monaco, "Courier New", Courier, monospace, "Symbola";
+    font-size: 80%;
+}
+
+pre {
+    overflow:hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
+/* styling for divs that will be invisible when printing
+   when printing. */
+
+div.header, div.footer, div.near, div.definition, p.comment, a.tag {
+    
+    font-size: 14pt;
+}
+@media print {
+    div.header, div.footer, div.near, div.definition, p.comment, a.tag {
+	font-size: 8pt;
+    }
+}
+
+div.footer form.search {
+    display: none;
+}
+div.rc li + li {
+    margin-top: 1em;
+}
+div.rc li strong, table.history strong, strong.description {
+    font-family: inherit;
+    font-weight: inherit;
+}
+div.diff {
+    padding-left: 5%;
+    padding-right: 5%;
+    font-size: 12pt;
+    color: #000;
+
+}
+div.old {
+    background-color: #ffffaf;
+}
+div.new {
+    background-color: #cfffcf;
+}
+
+div.refer {
+    padding-left: 5%;
+    padding-right: 5%;
+    font-size: 12pt;
+}
+
+div.message {
+    background-color:#fee;
+    color:#000;
+}
+
+img.xml {
+    border:none;
+    padding:1px;
+}
+a.small img {
+    max-width:300px;
+}
+a.large img {
+    max-width:600px;
+}
+div.sister {
+    margin-right:1ex;
+    background-color:inherit;
+}
+div.sister p {
+    margin-top:0;
+}
+div.sister hr {
+    display:none;
+}
+div.sister img {
+    border:none;
+}
+
+div.near, div.definition {
+    background-color:#efe;
+}
+
+div.sidebar {
+    float:right;
+    border:1px dotted #000;
+    padding:0 1em;
+}
+div.sidebar ul {
+    padding-left:1em;
+}
+
+/* replacements, features */
+
+ins {
+    color: #b33;
+    text-decoration: none;
+}
+acronym, abbr {
+    letter-spacing:0.1em;
+    font-variant:small-caps;
+}
+
+/* Interlink prefix not shown */
+a .site, a .separator {
+        display: none;
+}
+a cite { font:inherit; }
+/* browser borkage */
+textarea[name="text"] { width:97%; height:80%; }
+textarea[name="summary"] { width:97%; height:3em; }
+/* comments */
+textarea[name="aftertext"] { width:97%; height:10em; }
+div.commentshown {
+    font-size: 12pt;
+    padding: 2em 0;
+}
+div.commenthidden {
+    display:none;
+}
+div.commentshown {
+    display:block;
+}
+p.comment {
+    margin-bottom: 0;
+}
+div.comment {
+    font-size: 14pt;
+}
+div.comment h2 {
+    margin-top: 5em;
+}
+/* comment pages with username, homepage, and email subscription */
+.comment form span { display: block; }
+.comment form span label { display: inline-block; width: 10em; }
+/* IE sucks */
+.comment input#username,
+.comment input#homepage,
+.comment input#mail { width: 20em; }
+
+/* cal */
+div.month { padding:0; margin:0 2ex; }
+body > div.month {
+    float:right;
+    background-color: inherit;
+    border:solid thin;
+    padding:0 1ex;
+}
+.year > .month {
+    float:left;
+}
+.footer {
+    clear:both;
+}
+.month .title a.local {
+    background-color: inherit;
+}
+.month a.local {
+    background-color: #ddf;
+}
+.month a.today {
+    background-color: #fdd;
+}
+.month a {
+    color:inherit;
+    font-weight:inherit;
+    text-decoration: none;
+    background-color: #eee;
+}
+/* history tables and other tables */
+table.history {
+    border: none;
+}
+td.history {
+    border: none;
+}
+
+table.user {
+    border: none;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    padding: 1em;
+    margin: 1em 2em;
+}
+table.user tr td, table.user tr th {
+    border: none;
+    padding: 0.2em 0.5em;
+    vertical-align: top;
+}
+table.arab tr th {
+    font-weight:normal;
+    text-align:left;
+    vertical-align:top;
+}
+table.arab, table.arab tr th, table.arab tr td {
+    border:none;
+}
+th.nobreak {
+    white-space:nowrap;
+}
+table.full { width:99%; margin-left:1px; }
+table.j td, table.j th, table tr td.j, table tr th.j, .j { text-align:justify; }
+table.l td, table.l th, table tr td.l, table tr th.l, .l { text-align:left; }
+table.r td, table.r th, table tr td.r, table tr th.r, .r { text-align:right; }
+table.c td, table.c th, table tr td.c, table tr th.c, .c { text-align:center; }
+table.t td { vertical-align: top; }
+td.half { width:50%; }
+td.third { width:33%; }
+
+form table td { padding:5px; }
+
+/* lists */
+dd { padding-bottom:0.5ex; }
+dl.inside dt { float:left; }
+/* search */
+div.search span.result { font-size:larger; }
+div.search span.info { font-size:smaller; font-style:italic; }
+div.search p.result { display:none; }
+
+img.logo {
+    float: right;
+    margin: 0 0 0 1ex;
+    padding: 0;
+    border: 1px solid #000;
+    opacity: 0.3;
+    background-color:#ffe;
+}
+
+/* images */
+
+div.content a.feed img, div.journal a.feed img,
+div.content a img.smiley, div.journal a img.smiley, img.smiley,
+div.content a.inline img, div.journal a.inline img,
+div.content li a.image img, div.journal li a.image img { 
+    margin: 0; padding: 0; border: none;
+}
+div.image a img {
+    margin-bottom: 0;
+}
+div.image span.caption {
+    margin: 0 1em;
+}
+
+img {
+    max-width: 100%;
+}
+
+.left { float:left; margin-right: 1em; }
+.right { float:right; margin-left: 1em; }
+.half a img { height: 50%; width: 50%; }
+div.left .left, div.right .right {
+    float:none;
+}
+.center { text-align:center; }
+table.aside {
+    float:right;
+    width:40%;
+    margin-left: 1em;
+    padding: 1ex;
+    border: 1px dotted #666;
+}
+table.aside td {
+    text-align:left;
+}
+div.sidebar {
+    float:right; width: 250px;
+    text-align: right;
+    border: none;
+    margin: 1ex;
+}
+
+.bigsidebar {
+    float:right;
+    width: 500px;
+    border: none;
+    margin-left: 1ex;
+    font-size: 80%;
+}
+
+dl.irc dt { width:20ex; float:left; text-align:right; clear:left; }
+dl.irc dt span.time { float:left; }
+dl.irc dd { margin-left:22ex; }
+
+/* portrait */
+
+div.footer, div.comment, hr { clear: both; }
+.portrait { float: left; font-size: small; margin-right: 1em; }
+.portrait a { color: #999; }
+
+div.left { float:left; margin:1em; padding: 0.5em; }
+div.left p { display:table-cell; }
+div.left p + p { display:table-caption; caption-side:bottom; }
+
+p.table a { float:left; width:20ex; }
+p.table + p { clear:both; }
+
+/* no bleeding
+@media screen {
+    div.content, div.rc {
+	overflow:hidden;
+    }
+} */
+
+/* rss */
+
+channel * { display: block; }
+
+channel title {
+    margin-top: 30pt;
+}
+copyright {
+    font-size: 14pt;
+    margin-top: 1em;
+}
+channel > link:before {
+    font-size: 18pt;
+    display: block;
+    margin: 1em;
+    padding: 0.5em;
+    content: "This is an RSS feed, designed to be read in a feed reader.";
+    color: red;
+    border: 1px solid red;
+}
+link, license {
+    font-size: 11pt;
+    margin-bottom: 9pt;
+}
+username:before { content: "Last edited by "; }
+username:after { content: "."; }
+generator:before { content: "Feed generated by "; }
+generator:after { content: "."; }
+channel description {
+    font-weight: bold;
+}
+item description {
+    font-style: italic;
+    font-weight: normal;
+    margin-bottom: 1em;
+}
+docs, language,
+pubDate, lastBuildDate, ttl, guid, category, comments,
+docs, image title, image link,
+status, version, diff, history, importance {
+    display: none;
+}

css/alex-2016.css

@@ -0,0 +1,536 @@
+/* This file is in the public domain. */
+html{ text-align: center; }
+
+body, rss {
+    font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+    font-style: normal;
+    font-size: 14pt;
+    padding: 1em 3em;
+    max-width: 72ex;
+    display: inline-block;
+    text-align: left;
+    color: #000;
+    background-color: #fff;
+}
+
+@media print {
+    body {
+	font-size: 12pt;
+    }
+    
+    /* hide all the crap */
+    div.diff, div.diff+hr, div.refer, div.near, div.definition, div.sister,
+    div.cal, div.footer, span.specialdays, span.gotobar, a.edit, a.number span,
+    div.rc form, form.tiny, p.comment, p#plus1, div.g-plusone, div.content a.feed {
+	display:none;
+    }
+    div.content a.book,
+    div.content a.movie {
+	text-decoration: none;
+    }
+    a cite {
+	font-style: italic;
+    }
+    img[alt="RSS"] { display: none }
+    a.rss { font-size: 8pt }
+}
+
+/* headings: we can use larger sizes if we use a lighter color.
+   we cannot inherit the font-family because header and footer use a narrow font. */
+
+h1, h2, h3, title {
+    font-family: inherit;
+    font-weight: normal;
+}
+h1, channel title {
+    font-size: 32pt;
+    margin: 1em 0 0.5em 0;
+    padding: 0.4em 0;
+}
+h2 {
+    font-size: 18pt;
+    margin: 2em 0 0 0;
+    padding: 0;
+}
+h3 {
+    font-size: inherit;
+    font-weight: bold;
+    padding: 0;
+    margin: 1em 0 0 0;
+    clear: both;
+}
+
+/* headers in the journal are smaller */
+
+div.journal h1, item title {
+    font-size: inherit;
+    padding: 0;
+    clear: both;
+    border-bottom: 1px solid #000;
+}
+div.journal h2 {
+    font-family: inherit;
+    font-size: inherit;
+}
+div.journal h3 {
+    font-family: inherit;
+    font-size: inherit;
+    font-weight: inherit;
+    font-style: italic;
+}
+div.journal hr {
+    visibility: hidden;
+}
+p.more {
+    margin-top: 3em;
+}
+/* Links in headings appear on journal pages. */
+
+h1 a, h2 a, h3 a {
+    color:inherit;
+    text-decoration:none;
+    font-weight: normal;
+} 
+h1 a:visited, h2 a:visited, h3 a:visited {
+    color: inherit;
+}
+
+/* for download buttons and the like */
+
+.button {
+    display: inline-block;
+    font-size: 120%;
+    cursor: pointer;
+    padding: 0.4em 0.6em;
+    text-shadow: 0px -1px 0px #ccc;
+    background-color: #cfa;
+    border: 1px solid #9d8;
+    border-radius: 5px;
+    box-shadow: 0px 1px 3px white inset, 0px 1px 3px black;
+}
+
+.button .icon {
+    color: #363;
+    text-shadow: 0px -1px 1px white, 0px 1px 3px #666;
+}
+
+.button a {
+    text-decoration: none;
+    font-weight: normal;
+}
+
+/* links */
+
+a.pencil {
+    padding-left: 1ex;
+    text-decoration: none;
+    color: inherit;
+    visibility: hidden;
+    transition: visibility 0s 1s, opacity 1s linear;
+    opacity: 0;
+}
+*:hover > a.pencil {
+    visibility: visible;
+    transition: opacity .5s linear;
+    opacity: 1;
+}
+@media print {
+    a.pencil {
+	display: none;
+    }
+}
+
+a.number {
+    text-decoration: none;
+}
+
+/* stop floating content from flowing over the footer */
+
+hr {
+    clear: both;
+}
+
+/* the distance between links in the navigation bars */
+
+span.bar a {
+    margin-right: 1ex;
+}
+
+a img {
+    border: none;
+}
+
+/* search box in the top bar */
+
+.header form, .header p {
+    display: inline;
+    white-space: nowrap;
+}
+label[for="searchlang"], #searchlang, .header input[type="submit"] {
+    /* don't use display: none! http://stackoverflow.com/questions/5665203/getting-iphone-go-button-to-submit-form */
+    visibility: hidden; position: absolute;
+}
+/* wrap on the iphone */
+@media only screen and (max-device-width: 480px) {
+}
+
+.header input {
+    width: 10ex;
+}
+
+/* other form fields */
+
+input[type="text"] {
+    padding: 0;
+    font-size: 80%;
+    line-height: 125%;
+}
+
+/* code */
+
+textarea, pre, code, tt {
+    font-family: "Andale Mono", Monaco, "Courier New", Courier, monospace, "Symbola";
+    font-size: 80%;
+}
+
+pre {
+    overflow:hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
+/* styling for divs that will be invisible when printing
+   when printing. */
+
+div.header, div.footer, div.near, div.definition, p.comment, a.tag {
+    
+    font-size: 14pt;
+}
+@media print {
+    div.header, div.footer, div.near, div.definition, p.comment, a.tag {
+	font-size: 8pt;
+    }
+}
+
+div.footer form.search {
+    display: none;
+}
+div.rc li + li {
+    margin-top: 1em;
+}
+div.rc li strong, table.history strong, strong.description {
+    font-family: inherit;
+    font-weight: inherit;
+}
+div.diff {
+    padding-left: 5%;
+    padding-right: 5%;
+    font-size: 12pt;
+    color: #000;
+
+}
+div.old {
+    background-color: #ffffaf;
+}
+div.new {
+    background-color: #cfffcf;
+}
+
+div.refer {
+    padding-left: 5%;
+    padding-right: 5%;
+    font-size: 12pt;
+}
+
+div.message {
+    background-color:#fee;
+    color:#000;
+}
+
+img.xml {
+    border:none;
+    padding:1px;
+}
+a.small img {
+    max-width:300px;
+}
+a.large img {
+    max-width:600px;
+}
+div.sister {
+    margin-right:1ex;
+    background-color:inherit;
+}
+div.sister p {
+    margin-top:0;
+}
+div.sister hr {
+    display:none;
+}
+div.sister img {
+    border:none;
+}
+
+div.near, div.definition {
+    background-color:#efe;
+}
+
+div.sidebar {
+    float:right;
+    border:1px dotted #000;
+    padding:0 1em;
+}
+div.sidebar ul {
+    padding-left:1em;
+}
+
+/* replacements, features */
+
+ins {
+    font-style: italic;
+    text-decoration: none;
+}
+acronym, abbr {
+    letter-spacing:0.1em;
+    font-variant:small-caps;
+}
+
+/* Interlink prefix not shown */
+a .site, a .separator {
+        display: none;
+}
+a cite { font:inherit; }
+/* browser borkage */
+textarea[name="text"] { width:97%; height:80%; }
+textarea[name="summary"] { width:97%; height:3em; }
+/* comments */
+textarea[name="aftertext"] { width:97%; height:10em; }
+div.commentshown {
+    font-size: 12pt;
+    padding: 2em 0;
+}
+div.commenthidden {
+    display:none;
+}
+div.commentshown {
+    display:block;
+}
+p.comment {
+    margin-bottom: 0;
+}
+div.comment {
+    font-size: 14pt;
+}
+div.comment h2 {
+    margin-top: 5em;
+}
+/* comment pages with username, homepage, and email subscription */
+.comment form span { display: block; }
+.comment form span label { display: inline-block; width: 10em; }
+/* IE sucks */
+.comment input#username,
+.comment input#homepage,
+.comment input#mail { width: 20em; }
+
+/* cal */
+div.month { padding:0; margin:0 2ex; }
+body > div.month {
+    float:right;
+    background-color: inherit;
+    border:solid thin;
+    padding:0 1ex;
+}
+.year > .month {
+    float:left;
+}
+.footer {
+    clear:both;
+}
+.month .title a.local {
+    background-color: inherit;
+}
+.month a.local {
+    background-color: #ddf;
+}
+.month a.today {
+    background-color: #fdd;
+}
+.month a {
+    color:inherit;
+    font-weight:inherit;
+    text-decoration: none;
+    background-color: #eee;
+}
+/* history tables and other tables */
+table.history {
+    border: none;
+}
+td.history {
+    border: none;
+}
+
+table.user {
+    border: none;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    padding: 1em;
+    margin: 1em 2em;
+}
+table.user tr td, table.user tr th {
+    border: none;
+    padding: 0.2em 0.5em;
+    vertical-align: top;
+}
+table.arab tr th {
+    font-weight:normal;
+    text-align:left;
+    vertical-align:top;
+}
+table.arab, table.arab tr th, table.arab tr td {
+    border:none;
+}
+th.nobreak {
+    white-space:nowrap;
+}
+table.full { width:99%; margin-left:1px; }
+table.j td, table.j th, table tr td.j, table tr th.j, .j { text-align:justify; }
+table.l td, table.l th, table tr td.l, table tr th.l, .l { text-align:left; }
+table.r td, table.r th, table tr td.r, table tr th.r, .r { text-align:right; }
+table.c td, table.c th, table tr td.c, table tr th.c, .c { text-align:center; }
+table.t td { vertical-align: top; }
+td.half { width:50%; }
+td.third { width:33%; }
+
+form table td { padding:5px; }
+
+/* lists */
+dd { padding-bottom:0.5ex; }
+dl.inside dt { float:left; }
+/* search */
+div.search span.result { font-size:larger; }
+div.search span.info { font-size:smaller; font-style:italic; }
+div.search p.result { display:none; }
+
+img.logo {
+    float: right;
+    margin: 0 0 0 1ex;
+    padding: 0;
+    border: 1px solid #000;
+    opacity: 0.3;
+    background-color:#ffe;
+}
+
+/* images */
+
+div.content a.feed img, div.journal a.feed img,
+div.content a img.smiley, div.journal a img.smiley, img.smiley,
+div.content a.inline img, div.journal a.inline img,
+div.content li a.image img, div.journal li a.image img { 
+    margin: 0; padding: 0; border: none;
+}
+div.image a img {
+    margin-bottom: 0;
+}
+div.image span.caption {
+    margin: 0 1em;
+}
+
+img {
+    max-width: 100%;
+}
+
+.left { float:left; margin-right: 1em; }
+.right { float:right; margin-left: 1em; }
+.half img { height: 50%; width: 50%; }
+.face img { width: 200px; }
+div.left .left, div.right .right {
+    float:none;
+}
+.center { text-align:center; }
+table.aside {
+    float:right;
+    width:40%;
+    margin-left: 1em;
+    padding: 1ex;
+    border: 1px dotted #666;
+}
+table.aside td {
+    text-align:left;
+}
+div.sidebar {
+    float:right; width: 250px;
+    text-align: right;
+    border: none;
+    margin: 1ex;
+}
+
+.bigsidebar {
+    float:right;
+    width: 500px;
+    border: none;
+    margin-left: 1ex;
+    font-size: 80%;
+}
+
+dl.irc dt { width:20ex; float:left; text-align:right; clear:left; }
+dl.irc dt span.time { float:left; }
+dl.irc dd { margin-left:22ex; }
+
+/* portrait */
+
+div.footer, div.comment, hr { clear: both; }
+.portrait { float: left; font-size: small; margin-right: 1em; }
+.portrait a { color: #999; }
+
+div.left { float:left; margin:1em; padding: 0.5em; }
+div.left p { display:table-cell; }
+div.left p + p { display:table-caption; caption-side:bottom; }
+
+p.table a { float:left; width:20ex; }
+p.table + p { clear:both; }
+
+/* rss */
+
+channel * { display: block; }
+
+channel title {
+    margin-top: 30pt;
+}
+copyright {
+    font-size: 14pt;
+    margin-top: 1em;
+}
+channel > link:before {
+    font-size: 18pt;
+    display: block;
+    margin: 1em;
+    padding: 0.5em;
+    content: "This is an RSS feed, designed to be read in a feed reader.";
+    color: red;
+    border: 1px solid red;
+}
+link, license {
+    font-size: 11pt;
+    margin-bottom: 9pt;
+}
+username:before { content: "Last edited by "; }
+username:after { content: "."; }
+generator:before { content: "Feed generated by "; }
+generator:after { content: "."; }
+channel description {
+    font-weight: bold;
+}
+item description {
+    font-style: italic;
+    font-weight: normal;
+    margin-bottom: 1em;
+}
+docs, language,
+pubDate, lastBuildDate, ttl, guid, category, comments,
+docs, image title, image link,
+status, version, diff, history, importance {
+    display: none;
+}

css/beige.css

@@ -108,6 +108,35 @@ a:active {
 	color:#a41;
 	background-color: inherit;
 }
+.button {
+	display: inline-block;
+	font-size: 150%;
+	cursor: pointer;
+	padding: 0.3em 0.5em;
+	text-shadow: 0px -1px 0px #ccc;
+	background-color: #cfa;
+	border: 1px solid #9d8;
+	border-radius: 5px;
+	box-shadow: 0px 1px 3px white inset,
+	            0px 1px 3px black;
+}
+.button a {
+	text-decoration: none;
+	font-weight: normal;
+}
+
+/* table of contents */
+.toc {
+    font-size: smaller;
+    border-left: 1em solid #886;
+}
+.toc ol {
+    list-style-type: none;
+    padding-left: 1em;
+}
+.toc a {
+    font-weight: normal;
+}
 
 /* images with links, captions, etc */
 div.image { display: inline; margin: 1em; font-size: 90%; text-align: center; }
@@ -179,7 +208,7 @@ div.rc hr { display: none; }
 
 /* Tables */
 table.user {
-    margin: 1em 4em;
+    margin: 1em 0;
     padding: 0 1em;
     border-top: 1px solid black;
     border-bottom: 1px solid black;

css/bootstrap.css

@@ -0,0 +1,347 @@
+/* Public Domain
+   Written by Alex Schroeder and Evgkeni Sampelnikof */
+textarea { width:100%; }
+h1 a { color: inherit }
+div.journal h1 { font-size:large; }
+table { margin-bottom: 1em; }
+
+div.diff { padding-left:5%; padding-right:5%; }
+div.old { background-color:#FFFFAF; }
+div.new { background-color:#CFFFCF; }
+
+img.portrait { float: left; clear: left; margin: 1ex; border:#999 1px solid; }
+div.footer, div.comment, hr { clear: both; }
+div.portrait { float: left; clear: left; font-size: xx-small; margin-right: 1em; }
+div.portrait img.portrait { float: none; margin: 0; }
+div.portrait a { text-decoration: none; color: #999; }
+div.color {
+    clear: both;
+    padding: 1ex 2em;
+    margin: 0 -1em;
+    box-shadow: inset 40px 0px 20px -20px #EEEEEE,
+        inset -40px 0px 20px -20px #EEEEEE;
+}
+
+.left { float:left; margin-right:1em; }
+.right { float:right; margin-left:1em; }
+
+div.two, div.one {
+    color: #444;
+    background-color: #f8f8f8;
+    margin: 7px -1em;
+    box-shadow: inset 40px 0px 20px -20px #EEEEEE,
+        inset -40px 0px 20px -20px #EEEEEE,
+        0px 8px 4px -8px #ccc,
+        0px -6px 4px -8px #ccc;
+}
+
+.irc .time { display: none; }
+dl.irc dt { float: left; text-align: right; width: 13ex; }
+dl.irc dd { margin-left: 15ex; display: block; }
+
+div.toc {
+    background-color: #FAFAFA;
+    border: 1px solid #dddddd;
+    font-family: sans-serif;
+    font-size: 80%;
+    line-height: 90%;
+    margin: 3em 0 1em;
+    padding: 1em 0px 0px 1em;
+    border-radius: 3px;
+}
+div.toc li {
+    font-size: 12px;
+    line-height: 20px;
+}
+.ell .toc li {
+    display: inline;
+    padding-right: 1em;
+}
+div.letter { column-count: 3; -webkit-column-count: 3; -moz-column-count: 3 }
+
+.footer .edit.bar {
+    display: block;
+    text-align: center;
+}
+
+.specialdays {
+    line-height: 1em; /* has no effect: set for div.header instead? */
+    font-size: 0.9em;
+}
+
+.footer .time {
+    display: block;
+    text-align: center;
+    color: #666;
+    font-size: 10px;
+    font-weight: bold;
+    line-height: 12px;
+}
+
+.footer  {
+    color: #888;
+    line-height: 20px;
+}
+
+.footer .legal {
+    text-align: justify;
+    -moz-text-align-last: center;
+    text-align-last: center;
+    font-size: 0.9em;
+    line-height: 1.4em;
+    margin: 0 120px 0;
+    padding: 1em 0 0;
+}
+.footer .legal a {
+    color: #888;
+    text-decoration: underline;
+}
+
+.translation.bar {
+  display: block;
+  text-align: center;
+  font-size: 0.8em;
+  padding-top: 5px;
+}
+
+/* .include.WikiLanguageMenu could share those styles,
+(altough it might be better to leave it left-aligned) */
+
+.translation.bar a:nth-child(n+2) {
+    border-left: 1px solid #999;
+}
+
+.translation.bar a {
+    padding: 6px;
+    display: inline-block;
+}
+
+.navbar .nav > li > a.brand {
+  color: #C76A0D;
+  padding: 5px 8px 0;
+}
+
+a {
+  color: #C76A0D;
+}
+a:hover {
+  color: #8F3E0F;
+}
+
+body {
+    word-wrap: break-word;
+    padding-left: 20px;
+    padding-right: 20px;
+    background-color: #EEEEEE;
+    color: #000;
+    font-size: 0.8em;
+}
+
+pre {
+    font-size: 1em;
+    line-height: 1.5em;
+}
+
+hr {
+  border-top: #ccc 1px solid;
+  border-bottom: #fff 1px solid;
+}
+
+.footer_wrapper {
+    background: #EEEEEE;
+    background: linear-gradient(to bottom, #EEEEEE, #CCCCCC);
+    padding-bottom: 20px;
+    margin-left: -20px;
+    margin-right: -20px;
+    padding-left: 20px;
+    padding-right: 20px;
+}
+
+.footer.container hr:first-child {
+  display: none;
+}
+.footer hr {
+   margin: 10px 100px 0;
+}
+.footer.container {
+  padding-top: 10px;
+  margin-top: 10px;
+  background: radial-gradient(
+    50% 8px at top,
+    rgba(0, 0, 0, 0.3) 0%,
+    rgba(0, 0, 0, 0) 100%
+  );
+  box-shadow: 0 -1px 2px -2px white;
+  /* border-top: 1px #ccc solid; */
+}
+body, li {
+    line-height: 2em;
+}
+h1, h2, h3 {
+  text-shadow: 1px 1px white;
+}
+.navbar-inner {
+  border-radius: 0 0 4px 4px;
+  border-width: 0 1px 1px;
+}
+.navbar .nav > li > a {
+    padding: 10px;
+}
+
+label[for="searchlang"], input#searchlang {
+    display: none;
+}
+
+@media (max-width:480px){
+    h1 { font-size: 1.8em; }
+    .navbar .nav > li > a {
+	    padding: 0px 2px;
+	    line-height: 10px;
+    }
+    /* hide CC logo */
+    .footer .licence {
+	    display: none;
+    }
+    /* make legal foo*/
+    .footer .legal {
+	    margin: 5px 5px 5px;
+    }
+    .footer .bar a {
+	    margin: 2px 0;
+    }
+}
+
+/* Right-alignment. Will make it harder to achieve responsive behaviour:
+
+twitter.github.com/bootstrap/components.html#navbar
+Look for "Responsive navbar" heading.
+
+If this is undesirable, remove the lines with the "RA" comment;
+*/
+
+.navbar .nav {
+    text-align: right; /* RA */
+    *text-align: left; /* RA */
+    width: 100%; /* RA */
+}
+
+.navbar .nav > li:first-child {
+    float: left; /* RA */
+}
+
+.navbar .nav > li {
+    display: inline-block; /* RA */
+    float: none; /* RA */
+    *float: left;
+    *display: inline;
+
+    line-height: 20px;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+    border-color: rgba(236,160,73,.8);
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075),
+        0 0 8px rgba(236,160,73,.6);
+}
+
+/* IE7/8 Flexibility */
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+    width: auto;
+    max-width: 940px;
+}
+
+/* Don't widen the layout past 940 */
+
+@media (min-width: 1200px) {
+    .container,
+    .navbar-static-top .container,
+    .navbar-fixed-top .container,
+    .navbar-fixed-bottom .container {
+        width: 940px;
+    }
+}
+
+div.comment {
+    background: radial-gradient(
+        50% 8px at top,
+        rgba(0, 0, 0, 0.3) 0%,
+        rgba(0, 0, 0, 0) 100%
+    );
+    background-repeat: no-repeat;
+    box-shadow: 0 -1px 2px -2px white;
+    padding-top: 20px;
+}
+
+div.comment p:nth-child(2) {
+    color: #666;
+    /* line-height: 15px; */
+    font-size: 0.9em;
+    line-height: 1.4em;
+}
+
+div.comment p:nth-child(1) {
+    margin-bottom: 0px;
+}
+
+.comment textarea {
+    width: 100%;
+    *width: auto;
+    resize: vertical;
+    *resize: both;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+/* highlighting source code */
+
+span.builtin      { color: #483d8b; } /* DarkSlateBlue */
+span.comment      { color: #b22222; } /* Firebrick */
+span.constant     { color: #008b8b; } /* DarkCyan */
+span.function     { color: #0000ff; } /* Blue1 */
+span.keyword      { color: #7f007f; } /* Purple */
+span.string       { color: #8b475d; } /* VioletRed4 */
+span.type         { color: #228b22; } /* ForestGreen */
+span.warning      { color: #ff0000; font-weight: bold; } /* Red1 */
+span.comment span,
+span.string  span { color: inherit; }
+span.comment span.important.constant,
+span.string  span.important.constant { color: #008b8b; }
+
+/* old: Equivalent to Output::HTML */
+
+span.linecomment  { color: #b22222; } /* firebrick */
+span.blockcomment { color: #b22222; } /* firebrick */
+span.prepro       { color: purple; }
+span.select       { font-weight: bold; }
+span.quote        { color: #8b475d; } /* VioletRed4 */
+span.category_1   { color: teal; }
+span.category_2   { color: blue; }
+span.category_3   { color: blue; }
+
+code {
+    white-space: pre-wrap;
+}
+
+/* Local Variables: */
+/* css-indent-offset: 4 */
+/* End: */

css/emacs.css

@@ -115,6 +115,7 @@ div.toc h2 {
 
 /* get rid of useless "10 results found" when using indexed search. */
 div.search p.result { display:none; }
+label[for="searchlang"], input#searchlang { display: none; }
 
 form.tiny, form.tiny p {
     display:inline;
@@ -237,9 +238,6 @@ a.near:link {
 a.near:visited {
     color:#550;
 }
-a.tag:before {
-    content:"\2601\ ";
-}
 ol, ul, dl {
     padding-top:0.5em;
 }
@@ -249,7 +247,7 @@ dd, li {
 
 /* elisp files and other scripts for download */
 
-p.download a {
+p.download a, a.download {
     padding: 0.5em;
     color: black;
     text-decoration: none;
@@ -338,7 +336,22 @@ div.month a.local {
 
 /* highlighting */
 
-/* Equivalent to Output::HTML */
+/* highlighting source code */
+
+span.builtin      { color: #483d8b; } /* DarkSlateBlue */
+span.comment      { color: #b22222; } /* Firebrick */
+span.constant     { color: #008b8b; } /* DarkCyan */
+span.function     { color: #0000ff; } /* Blue1 */
+span.keyword      { color: #7f007f; } /* Purple */
+span.string       { color: #8b475d; } /* VioletRed4 */
+span.type         { color: #228b22; } /* ForestGreen */
+span.warning      { color: #ff0000; font-weight: bold; } /* Red1 */
+span.comment span,
+span.string  span { color: inherit; }
+span.comment span.important.constant,
+span.string  span.important.constant { color: #008b8b; }
+
+/* old: Equivalent to Output::HTML */
 
 span.linecomment  { color: green; }
 span.blockcomment { color: green; }

css/green.css

@@ -321,7 +321,6 @@ div.sister {
     float:left;
     margin-right:1ex;
     padding-right:1ex;
-    border-right:1px dashed;
 }
 div.sister p { padding:1ex; margin:0; }
 div.sister hr { display:none; }

css/light.css

@@ -0,0 +1,266 @@
+/* This file is in the public domain. */
+
+/* Esteban is nice, but bold is not so nice, and on Windows it suffers.
+   @import url(http://fonts.googleapis.com/css?family=Esteban&subset=latin,latin-ext);
+
+   For campaignwiki.org, we need to use the same URL in the config file when
+   calling wkhtmltopdf.
+
+   @import url(https://fonts.googleapis.com/css?family=Noticia+Text:400,400italic,700italic,700&subset=latin,latin-ext); */
+
+body {
+	font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+	font-size: 14pt;
+	color: #000;
+	background-color: #eed;
+	margin:1em 2em;
+}
+
+textarea, pre, code, tt {
+	font-family: "Andale Mono", Monaco, "Courier New", Courier, monospace, Symbola;
+	font-size: 80%;
+}
+
+@media print {
+	body {
+		background-color: white;
+		font-family: Times, serif;
+		font-size:10pt;
+	}
+	/* Printing from Firefox */
+	svg {
+	    transform: translate(-1.5cm, -1cm);
+	}
+}
+
+/* iPhone */
+
+@media only screen and (max-device-width: 480px) {
+	img  { max-width: 480px !important; }
+}
+
+/* iPad */
+
+@media only screen and (min-device-width: 481px) and (max-device-width: 900px) {
+	body  { font-size: 150%; }
+	textarea,input { font-size: 100%; }
+	img  { max-width: 550px !important; }
+}
+
+/* general */
+.browse { min-height: 3em; }
+.header form, .header p { margin: 0; }
+/* hide the buttons but don't use display:none because of
+   http://stackoverflow.com/questions/5665203/getting-iphone-go-button-to-submit-form
+.header input[type="submit"] { position: absolute; visibility: hidden; } */
+.header input { width: 6em; font-size: 80%; }
+.header input[type="checkbox"] { width: 1em; }
+.footer { clear:both; font-size: 90%; }
+.content input { font-size: 80%; line-height: 125%; }
+
+/* comments, footer */
+div.commentshown {
+	padding-bottom: 1ex;
+	padding-left: 2em;
+	border-left: 2px solid black;
+	font-size: smaller;
+}
+div.commenthidden { display:none; }
+div.commentshown { display:block; }
+/* comment pages with username, homepage, and email subscription */
+.comment span { display: block; }
+.comment span label {
+	display: inline-block; width: 10em;
+}
+input#mail, input#homepage, input#username {
+	display: inline-block; width: 20em;
+}
+
+/* titles */
+h1 {
+	font-weight: bold;
+	font-size: 150%;
+	padding: 1em 0;
+}
+h1 a:link, h1 a:visited {
+	color: inherit;
+	background-color: inherit;
+	text-decoration: inherit;
+}
+h2 {
+	font-weight: bold;
+	font-size: 130%;
+	padding: 1em 0;
+	clear: both;
+}
+@media print {
+	h1 a, h2 a, h3 a, h4 a { font-style: normal; }
+}
+
+/* links */
+a:link {
+	color: #851;
+	background-color: inherit;
+}
+a:visited {
+	color: #542;
+	background-color: inherit;
+}
+a:active {
+	color:#a41;
+	background-color: inherit;
+}
+.button {
+	display: inline-block;
+	font-size: 150%;
+	cursor: pointer;
+	padding: 0.3em 0.5em;
+	text-shadow: 0px -1px 0px #ccc;
+	background-color: #cfa;
+	border: 1px solid #9d8;
+	border-radius: 5px;
+	box-shadow: 0px 1px 3px white inset,
+			0px 1px 3px black;
+}
+.button a {
+	text-decoration: none;
+	font-weight: normal;
+}
+.bar a { padding-right: 1em; }
+@media print {
+	a, a:link, a:visited {
+		color:#000;
+		text-decoration:none;
+		font-weight: normal;
+	}
+	a.edit, div.footer, form, span.gotobar, a.number span { display:none; }
+	img[smiley] { line-height: inherit; }
+}
+
+/* edit paragraphs: no more */
+a.pencil { display: none; }
+
+/* table of contents */
+.toc {
+	font-size: smaller;
+	border-left: 1em solid #886;
+}
+.toc ol {
+	list-style-type: none;
+	padding-left: 1em;
+}
+.toc a {
+	font-weight: normal;
+}
+
+/* images with links, captions, etc */
+div.image { display: inline; margin: 1em; font-size: 90%; text-align: center; }
+.left { float: left; margin-right: 1em; }
+.right { float: right; margin-left: 1em; }
+div.right .right { float: none; }
+div.left .left { float: none; }
+.caption { padding: 0 1em; }
+.license { font-size: small; }
+.aside {
+	font-size: small;
+	width: 30%;
+	float: right;
+	margin-left: 1em;
+	margin-bottom: 1em;
+	padding-left: 1em;
+}
+.aside img.smiley { height: 1em; }
+.narrow {
+	width: 70%;
+}
+
+a img { border: 1px solid #333; }
+.fit img { width: 80%; text-align: center; margin: 2em 8%; }
+.half img { width: 50%; height: 50%; text-align: center; margin: 2em 8%; }
+.noborder img { border: none; }
+.twenty img { max-width: 20em; }
+img.logo {
+	float: right;
+	clear: right;
+	border-style:none;
+	margin-left: 1em;
+	margin-bottom: 1ex;
+	border: 1px solid black;
+}
+
+.hexmap a img { background: #fff; border: none; }
+
+/* fancy bold underline */
+em.underline { font-weight: bold; }
+
+/* editing, previewing */
+textarea { width:100%; }
+div.edit { padding-right: 1em; }
+div.diff { padding-left:5%; padding-right:5%; }
+div.old { background-color:#FFFFAF; }
+div.new { background-color:#CFFFCF; }
+/* div.message { background-color:#FEE; } */
+div.message {
+	background-color: inherit;
+	font-size: smaller;
+}
+table.history { border-style:none; }
+td.history { border-style:none; }
+div.history span.dash + strong { font-weight: normal; }
+span.result { font-size:larger; }
+span.info { font-size:smaller; font-style:italic; }
+div.rc hr { display: none; }
+div.rc li { padding-bottom: 0.5em; }
+div.rc li strong { font-weight: normal; }
+
+/* Tables */
+table.user {
+	margin: 1em 0;
+	padding: 0 1em;
+	border-top: 1px solid black;
+	border-bottom: 1px solid black;
+ }
+div.aside table.user {
+	margin: 1em 0;
+	padding: 0;
+}
+table.user td, table.user th {
+	border-style: none;
+	padding:5px 10px;
+	vertical-align: top; 
+}
+table.user th { font-weight:bold; }
+table.user td.r { text-align:right; }
+table.user td.l { text-align:left; }
+table.user td.c { text-align:center; }
+table.user td.j { text-align:justify; }
+table.user td.mark { background-color:yellow; }
+tr:empty { display: block; height: 0.5em; }
+@media print {
+	table {
+		font-size: 9pt;
+		margin: 0;
+	}
+	table.user td, table.user th {
+		padding: 0 1ex;
+	}
+}
+
+/* Calendar */
+div.month { margin:0; padding:0; font-size:x-small; float:right; }
+div.content div.month { float:none; }
+div.year div.month { float:left; font-size:medium; padding:1ex; }
+div.month pre { margin:0; padding:0 0 0 1ex; }
+div.month a { text-decoration:none; font: inherit; }
+div.month span.title a { font: inherit; }
+/* no difference between a.exact and a.collection */
+div.month a.local { font-weight: bold; }
+div.month a.local:link { color: #562; }
+div.month a.local:visited { color: #542; }
+div.month a.today { background-color: #faa; }
+div.month span.title a.local { font-weight: normal; color: #842; }
+@media print {
+	div.month { display: none; }
+	div.year div.month { display: block; }
+	div.year div.month a { display: inline; }
+}

css/minimal.css

@@ -0,0 +1,88 @@
+body { background-color:#FFF; color:#000; margin:1em 2em; }
+@media only screen and (max-device-width: 480px) {
+    body { font-size: 300%; }
+}
+textarea { width:100%; }
+a:link { color:#00F; }
+a:visited { color:#A0A; }
+a:active { color:#F00; }
+a.alias { text-decoration:none; border-bottom: thin dashed; }
+a.near:link { color:#093; }
+a.near:visited { color:#550; }
+img.logo { float: right; clear: right; border-style:none; }
+div.diff { padding-left:5%; padding-right:5%; }
+div.old { background-color:#FFFFAF; }
+div.new { background-color:#CFFFCF; }
+div.message { background-color:#FEE; }
+div.journal h1 { font-size:large; }
+table.history { border-style:none; }
+td.history { border-style:none; }
+span.result { font-size:larger; }
+span.info { font-size:smaller; font-style:italic; }
+div.rss { background-color:#EEF; }
+div.search { background-color:#F1F5FF }
+div.sister { float:left; margin-right:1ex; background-color:#FFF; }
+div.sister p { margin-top:0; }
+div.sister img { border:none; }
+div.near, div.definition { background-color:#EFE; }
+div.near p, div.definition p { margin-top:0; }
+form.comment span { display: block; }
+@media print {
+    body { font:12pt sans-serif; }
+    a, a:link, a:visited { color:#000; text-decoration:none; font-style:oblique; }
+    h1 a, h2 a, h3 a, h4 a { font-style:normal; }
+    a.edit, div.footer, form, span.gotobar, a.number span { display:none; }
+    a[class="url number"]:after, a[class="inter number"]:after { content:"[" attr(href) "]"; }
+    a[class="local number"]:after { content:"[" attr(title) "]"; }
+    img[smiley] { line-height: inherit; }
+}
+/* calendar */
+div.month { margin:0; padding:0; font-size:x-small; float:right; }
+div.content div.month { float:none; }
+div.footer { clear:both; }
+div.year div.month { float:left; font-size:medium; padding:1ex; }
+div.month pre { margin:0; padding:0 0 0 1ex; background-color:#ffe; }
+div.month a { text-decoration:none; color:inherit; }
+div.month span.title a { background-color:inherit; }
+div.month a.exact { background-color:#eef; }
+div.month a.collection { background-color:#ccf; }
+div.month a.today { background-color:#fcc; }
+div.month a[class~="today"][class~="exact"] { background-color:#fcf; }
+div.month a[class~="today"][class~="collection"] { background-color:#faf; }
+@media print {
+    div.month { display: none; }
+    div.year div.month { display: block; }
+    div.year div.month a { display: inline; }
+}
+/* crumbs */
+span.crumbs { font-size: smaller; }
+/* dynamic comments */
+div.commenthidden { display:none; }
+div.commentshown { display:block; background-color:#ffc; padding:1ex; }
+/* irc */
+dl.irc dt { width:12ex; float:left; text-align:right; }
+dl.irc dd { margin-left:15ex; }
+/* page trail */
+@media print { span.trail { display: none; }}
+/* portrait support */
+img.portrait { float: left; clear: left; margin: 1ex; border:#999 1px solid; }
+div.footer, div.comment, hr { clear: both; }
+div.portrait { float: left; clear: left; font-size: xx-small; margin-right: 1em; }
+div.portrait img.portrait { float: none; margin: 0; }
+div.portrait a { text-decoration: none; color: #999; }
+div.color { clear: both; }
+div.one { background-color: #ddd; }
+/* referrer tracking */
+div.refer { padding-left:5%; padding-right:5%; font-size:smaller; }
+@media print { div.refer { display:none; }}
+/* usemod, tables, long tables */
+table.user { border-style:solid; border-width:thin; }
+table.user td, table.user th { border-style:solid; border-width:thin; padding:5px; }
+table.user th { font-weight:bold; }
+table.user td.r { text-align:right; }
+table.user td.l { text-align:left; }
+table.user td.c { text-align:center; }
+table.user td.j { text-align:justify; }
+table.user td.mark { background-color:yellow; }
+/* sidebar */
+div.sidebar { float: left; margin-right: 2em; margin-bottom: 3em; }

css/oddmuse-2013.css

@@ -0,0 +1,230 @@
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Gentium Basic'), local('GentiumBasic'), url(http://themes.googleusercontent.com/static/fonts/gentiumbasic/v5/KCktj43blvLkhOTolFn-MVhr3SzZVY8L1R-AhaesIwA.woff) format('woff');
+}
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Gentium Basic Bold'), local('GentiumBasic-Bold'), url(http://themes.googleusercontent.com/static/fonts/gentiumbasic/v5/2qL6yulgGf0wwgOp-UqGyKuvVGpDTHxx0YlM6XbRIFE.woff) format('woff');
+}
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Gentium Basic Italic'), local('GentiumBasic-Italic'), url(http://themes.googleusercontent.com/static/fonts/gentiumbasic/v5/qoFz4NSMaYC2UmsMAG3lyajIwExuvJl80GezUi4i-sM.woff) format('woff');
+}
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Gentium Basic Bold Italic'), local('GentiumBasic-BoldItalic'), url(http://themes.googleusercontent.com/static/fonts/gentiumbasic/v5/8N9-c_aQDJ8LbI1NGVMrwjBWbH-5CKom31QWlI8zOIM.woff) format('woff');
+}
+
+body {
+    background:#fff;
+    padding:2% 5%;
+    margin:0;
+    font-family: "Gentium Basic", "Bookman Old Style", "Times New Roman", serif;
+    font-size: 16pt;
+}
+
+div.header h1 {
+    margin-top:2ex;
+}
+
+a {
+    text-decoration: none;
+    color: #a00;
+}
+
+a:visited {
+    color: #d88;
+}
+
+div.header h1 a:hover, h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover,
+a:hover, span.caption a.image:hover {
+    background:#fee;
+}
+
+img.logo {
+    float: right;
+    clear: right;
+    border-style:none;
+    background-color:#fff;
+}
+
+img {
+    padding: 0.5em;
+    margin: 0 1em;
+}
+
+a.image:hover {
+    background:inherit;
+}
+
+a.image:hover img {
+    background:#fee;
+}
+
+/* a.definition soll aussehen wie h2 */
+h2, p a.definition {
+    display:block;
+    clear:both;
+}
+
+/* Such Link im h1 soll nicht auffallen. */
+h1, h2, h3, h4, h1 a, h1 a:visited, p a.definition {
+    color:#666;
+    font-size: 30pt;
+    font-weight: normal;
+    margin: 4ex 0 1ex 0;
+    padding: 0;
+    border-bottom: 1px solid #000;
+}
+
+h3, h4 {
+    font-size: inherit;
+}
+
+
+
+
+div.diff {
+    padding: 1em 3em;
+}
+div.old {
+    background-color:#FFFFAF;
+}
+div.new {
+    background-color:#CFFFCF;
+}
+div.old p, div.new p {
+    padding: 0.5em 0;
+}
+div.refer { padding-left:5%; padding-right:5%; font-size:smaller; }
+div[class="content refer"] p { margin-top:2em; }
+div.content div.refer hr { display:none; }
+div.content div.refer { padding:0; font-size:medium; }
+div.content div.refer p { margin:0; }
+div.refer a { display:block; }
+table.history { border-style:none; }
+td.history { border-style:none; }
+
+table.user {
+    border-style: none;
+    margin-left: 3em;
+}
+table.user tr td {
+    border-style: none;
+    padding:0.5ex 1ex;
+}
+
+dt {
+    font-weight:bold;
+}
+dd {
+    margin-bottom:1ex;
+}
+
+textarea {
+    width:100%;
+    height:80%;
+    font-size: 12pt;
+}
+textarea#summary { height: 3em; }
+input {
+    font-size: 12pt;
+}
+div.image span.caption {
+    margin: 0 1em;
+}
+li img, img.smiley, .noborder img {
+    border:none;
+    padding:0;
+    margin:0;
+    background:#fff;
+    color:#000;
+}
+/* Google +1 */
+a#plus1 img {
+    background-color: #fff;
+    padding: 0;
+    margin: 0;
+    border: none;
+}
+
+div.header img, div.footer img { border:0; padding:0; margin:0; }
+
+.left { float:left; }
+.right { float:right; }
+div.left .left, div.right .right {
+    float:none;
+}
+.center { text-align:center; }
+
+span.author {
+    color: #501;
+}
+span.bar a {
+	padding-right:1ex;
+}
+
+.rc .author {
+    color: #655;
+}
+
+.rc strong {
+    font-weight: normal;
+    color: inherit;
+}
+
+.rc li {
+    position:relative;
+    padding: 1ex 0;
+}
+
+hr {
+    border:none;
+    color:black;
+    background-color:#000;
+    height:2px; 
+    margin-top:2ex;
+}
+
+div.footer hr {
+    height:4px;
+    margin: 2em 0 1ex 0;
+    clear:both;
+}
+
+div.content > div.comment {
+    border-top: none;
+    padding-top: none;
+    border-left: 1ex solid #bbb;
+    padding-left: 1ex;
+}
+
+div.wrapper > div.comment {
+  border-top: 2px solid #000;
+  padding-top: 2em;
+}
+
+pre {
+    padding: 0.5em;
+    margin-left: 1em;
+    margin-right: 2em;
+    white-space: pre;
+    overflow:hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
+tt, pre, code {
+    font-size: 80%;
+};

css/oddmuse-2014.css

@@ -0,0 +1,250 @@
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Gentium Basic'), local('GentiumBasic'), url(/fonts/GenBasR.woff) format('woff');
+}
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Gentium Basic Bold'), local('GentiumBasic-Bold'), url(/fonts/GenBasB.woff) format('woff');
+}
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Gentium Basic Italic'), local('GentiumBasic-Italic'), url(/fonts/GenBasI.woff) format('woff');
+}
+@font-face {
+  font-family: 'Gentium Basic';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Gentium Basic Bold Italic'), local('GentiumBasic-BoldItalic'), url(/fonts/GenBasBI.woff) format('woff');
+}
+
+@font-face {
+  font-family: 'Gentium Plus';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Gentium Plus'), local('GentiumPlus'), url(/fonts/GentiumPlus-R.woff) format('woff');
+}
+@font-face {
+  font-family: 'Gentium Plus';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Gentium Plus Italic'), local('GentiumPlus-Italic'), url(/fonts/GentiumPlus-I.woff) format('woff');
+}
+
+@font-face {
+  font-family: 'Symbola';
+  src: local('Symbola'), url('/fonts/Symbola.woff') format('woff') url('/fonts/Symbola.ttf') format('truetype');
+}
+
+body {
+    background:#fff;
+    padding:2% 5%;
+    margin:0;
+    font-family: "Gentium Basic", "Gentium Plus", "Symbola", serif;
+    font-size: 16pt;
+}
+
+div.header h1 {
+    margin-top:2ex;
+}
+
+a {
+    text-decoration: none;
+    color: #a00;
+}
+
+a:visited {
+    color: #d88;
+}
+
+div.header h1 a:hover, h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover,
+a:hover, span.caption a.image:hover {
+    background:#fee;
+}
+
+img.logo {
+    float: right;
+    clear: right;
+    border-style:none;
+    background-color:#fff;
+}
+
+img {
+    padding: 0.5em;
+    margin: 0 1em;
+}
+
+a.image:hover {
+    background:inherit;
+}
+
+a.image:hover img {
+    background:#fee;
+}
+
+/* a.definition soll aussehen wie h2 */
+h2, p a.definition {
+    display:block;
+    clear:both;
+}
+
+/* Such Link im h1 soll nicht auffallen. */
+h1, h2, h3, h4, h1 a, h1 a:visited, p a.definition {
+    color:#666;
+    font-size: 30pt;
+    font-weight: normal;
+    margin: 4ex 0 1ex 0;
+    padding: 0;
+    border-bottom: 1px solid #000;
+}
+
+h3, h4 {
+    font-size: inherit;
+}
+
+
+
+
+div.diff {
+    padding: 1em 3em;
+}
+div.old {
+    background-color:#FFFFAF;
+}
+div.new {
+    background-color:#CFFFCF;
+}
+div.old p, div.new p {
+    padding: 0.5em 0;
+}
+div.refer { padding-left:5%; padding-right:5%; font-size:smaller; }
+div[class="content refer"] p { margin-top:2em; }
+div.content div.refer hr { display:none; }
+div.content div.refer { padding:0; font-size:medium; }
+div.content div.refer p { margin:0; }
+div.refer a { display:block; }
+table.history { border-style:none; }
+td.history { border-style:none; }
+
+table.user {
+    border-style: none;
+    margin-left: 3em;
+}
+table.user tr td {
+    border-style: none;
+    padding:0.5ex 1ex;
+}
+
+dt {
+    font-weight:bold;
+}
+dd {
+    margin-bottom:1ex;
+}
+
+textarea {
+    width:100%;
+    height:80%;
+    font-size: 12pt;
+}
+textarea#summary { height: 3em; }
+input {
+    font-size: 12pt;
+}
+div.image span.caption {
+    margin: 0 1em;
+}
+li img, img.smiley, .noborder img {
+    border:none;
+    padding:0;
+    margin:0;
+    background:#fff;
+    color:#000;
+}
+/* Google +1 */
+a#plus1 img {
+    background-color: #fff;
+    padding: 0;
+    margin: 0;
+    border: none;
+}
+
+div.header img, div.footer img { border:0; padding:0; margin:0; }
+/* No goto bar at the bottom. */
+.footer .gotobar, .footer .edit br { display: none; }
+
+.left { float:left; }
+.right { float:right; }
+div.left .left, div.right .right {
+    float:none;
+}
+.center { text-align:center; }
+
+span.author {
+    color: #501;
+}
+span.bar a {
+	padding-right:1ex;
+}
+
+.rc .author {
+    color: #655;
+}
+
+.rc strong {
+    font-weight: normal;
+    color: inherit;
+}
+
+.rc li {
+    position:relative;
+    padding: 1ex 0;
+}
+
+hr {
+    border:none;
+    color:black;
+    background-color:#000;
+    height:2px; 
+    margin-top:2ex;
+}
+
+div.footer hr {
+    height:4px;
+    margin: 2em 0 1ex 0;
+    clear:both;
+}
+
+div.content > div.comment {
+    border-top: none;
+    padding-top: none;
+    border-left: 1ex solid #bbb;
+    padding-left: 1ex;
+}
+
+div.wrapper > div.comment {
+  border-top: 2px solid #000;
+  padding-top: 2em;
+}
+
+pre {
+    padding: 0.5em;
+    margin-left: 1em;
+    margin-right: 2em;
+    white-space: pre;
+    overflow:hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
+tt, pre, code {
+    font-size: 80%;
+};

css/oddmuse.css

@@ -58,8 +58,12 @@ div.left .left, div.right .right {
 span.author {
     color: #501;
 }
+span.bar a:first-child {
+    margin-left:-0.5ex;
+}
 span.bar a {
-	padding-right:1ex;
+    padding-right:0.5ex;
+    padding-left:-0.5ex;
 }
 body {
     background:#fff;

css/wiki.css

@@ -1,88 +1,221 @@
-body { background-color:#FFF; color:#000; margin:1em 2em; }
-@media only screen and (max-device-width: 480px) {
-    body { font-size: 300%; }
+/* This is the default CSS file for Oddmuse wikis. It is dedicated to
+   the public domain. You can copy, modify, distribute and use the
+   work, even for commercial purposes, all without asking permission.
+   https://creativecommons.org/publicdomain/zero/1.0/ */
+
+body {
+    background: #fff;
+    padding: 2% 5%;
+    margin: 0;
+    font-family: "Palatino Linotype", "Book Antiqua", Palatino, serif;
+    font-size: 15pt;
 }
-textarea { width:100%; }
-a:link { color:#00F; }
-a:visited { color:#A0A; }
-a:active { color:#F00; }
-a.alias { text-decoration:none; border-bottom: thin dashed; }
-a.near:link { color:#093; }
-a.near:visited { color:#550; }
-img.logo { float: right; clear: right; border-style:none; }
-div.diff { padding-left:5%; padding-right:5%; }
-div.old { background-color:#FFFFAF; }
-div.new { background-color:#CFFFCF; }
-div.message { background-color:#FEE; }
-div.journal h1 { font-size:large; }
-table.history { border-style:none; }
-td.history { border-style:none; }
-span.result { font-size:larger; }
-span.info { font-size:smaller; font-style:italic; }
-div.rss { background-color:#EEF; }
-div.search { background-color:#F1F5FF }
-div.sister { float:left; margin-right:1ex; background-color:#FFF; }
-div.sister p { margin-top:0; }
-div.sister img { border:none; }
-div.near, div.definition { background-color:#EFE; }
-div.near p, div.definition p { margin-top:0; }
-form.comment span { display: block; }
-@media print {
-    body { font:12pt sans-serif; }
-    a, a:link, a:visited { color:#000; text-decoration:none; font-style:oblique; }
-    h1 a, h2 a, h3 a, h4 a { font-style:normal; }
-    a.edit, div.footer, form, span.gotobar, a.number span { display:none; }
-    a[class="url number"]:after, a[class="inter number"]:after { content:"[" attr(href) "]"; }
-    a[class="local number"]:after { content:"[" attr(title) "]"; }
-    img[smiley] { line-height: inherit; }
+
+div.header h1 {
+    margin-top: 2ex;
 }
-/* calendar */
-div.month { margin:0; padding:0; font-size:x-small; float:right; }
-div.content div.month { float:none; }
-div.footer { clear:both; }
-div.year div.month { float:left; font-size:medium; padding:1ex; }
-div.month pre { margin:0; padding:0 0 0 1ex; background-color:#ffe; }
-div.month a { text-decoration:none; color:inherit; }
-div.month span.title a { background-color:inherit; }
-div.month a.exact { background-color:#eef; }
-div.month a.collection { background-color:#ccf; }
-div.month a.today { background-color:#fcc; }
-div.month a[class~="today"][class~="exact"] { background-color:#fcf; }
-div.month a[class~="today"][class~="collection"] { background-color:#faf; }
-@media print {
-    div.month { display: none; }
-    div.year div.month { display: block; }
-    div.year div.month a { display: inline; }
+
+a {
+    text-decoration: none;
+    color: #a00;
+}
+
+a:visited {
+    color: #d88;
+}
+
+div.header h1 a:hover, h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover,
+a:hover, span.caption a.image:hover {
+     background: #fee;
+}
+
+img.logo {
+    float: right;
+    clear: right;
+    border-style: none;
+    background-color: #fff;
+}
+
+img {
+    padding: 0.5em;
+    margin: 0 1em;
+    max-width: 95%;
+}
+
+a.image:hover {
+    background: inherit;
+}
+
+a.image:hover img {
+    background: #fee;
+}
+
+/* a.definition soll aussehen wie h2 */
+h2, p a.definition {
+    display: block;
+    clear: both;
+}
+
+/* Such Link im h1 soll nicht auffallen. */
+h1, h2, h3, h4, h1 a, h1 a:visited, p a.definition {
+    color: #666;
+    font-size: 30pt;
+    font-weight: normal;
+    margin: 4ex 0 1ex 0;
+    padding: 0;
+    border-bottom: 1px solid #000;
+}
+
+h3, h4 {
+    font-size: inherit;
+}
+
+div.diff {
+    padding: 1em 3em;
+}
+div.old {
+    background-color: #FFFFAF;
+}
+div.new {
+    background-color: #CFFFCF;
+}
+div.old p, div.new p {
+    padding: 0.5em 0;
+}
+div.refer { padding-left: 5%; padding-right: 5%; font-size: smaller; }
+div[class="content refer"] p { margin-top: 2em; }
+div.content div.refer hr { display: none; }
+div.content div.refer { padding: 0; font-size: medium; }
+div.content div.refer p { margin: 0; }
+div.refer a { display: block; }
+table.history { border-style: none; }
+td.history { border-style: none; }
+
+table.user {
+    border-style: none;
+    margin-left: 3em;
+}
+table.user tr td {
+    border-style: none;
+    padding: 0.5ex 1ex;
+}
+
+dt {
+    font-weight: bold;
+}
+dd {
+    margin-bottom: 1ex;
+}
+
+textarea {
+    width: 100%;
+    height: 80%;
+    font-size: 12pt;
+}
+textarea#summary { height: 3em; }
+input {
+    font-size: 12pt;
+}
+div.image span.caption {
+    margin: 0 1em;
+}
+li img, img.smiley, .noborder img {
+    border: none;
+    padding: 0;
+    margin: 0;
+    background: #fff;
+    color: #000;
+}
+/* Google +1 */
+a#plus1 img {
+    background-color: #fff;
+    padding: 0;
+    margin: 0;
+    border: none;
+}
+
+div.header img, div.footer img { border: 0; padding: 0; margin: 0; }
+/* No goto bar at the bottom. */
+.footer .gotobar, .footer .edit br { display: none; }
+
+.left { float: left; }
+.right { float: right; }
+div.left .left, div.right .right {
+    float: none;
+}
+.center { text-align: center; }
+
+span.author {
+    color: #501;
+}
+
+span.bar a:first-child {
+    margin-left: -0.5ex;
+}
+
+span.bar a {
+    padding-right: 0.5ex;
+    padding-left: 0.5ex;
+}
+
+.rc .author {
+    color: #655;
+}
+
+.rc strong {
+    font-weight: normal;
+    color: inherit;
+}
+
+.rc li {
+    position: relative;
+    padding: 1ex 0;
+}
+
+hr {
+    border: none;
+    color: black;
+    background-color: #000;
+    height: 2px;
+    margin-top: 2ex;
+}
+
+div.footer hr {
+    height: 4px;
+    margin: 2em 0 1ex 0;
+    clear: both;
+}
+
+div.content > div.comment {
+    border-top: none;
+    padding-top: 0;
+    border-left: 1ex solid #bbb;
+    padding-left: 1ex;
+}
+
+div.wrapper > div.comment {
+    border-top: 2px solid #000;
+    padding-top: 2em;
+}
+
+pre {
+    padding: 0.5em;
+    margin-left: 1em;
+    margin-right: 2em;
+    white-space: pre;
+    overflow: hidden;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* Internet Explorer 5.5+ */
+}
+
+tt, pre, code {
+    font-size: 80%;
+}
+
+code {
+    background: #eee;
+    white-space: pre-wrap;
 }
-/* crumbs */
-span.crumbs { font-size: smaller; }
-/* dynamic comments */
-div.commenthidden { display:none; }
-div.commentshown { display:block; background-color:#ffc; padding:1ex; }
-/* irc */
-dl.irc dt { width:12ex; float:left; text-align:right; }
-dl.irc dd { margin-left:15ex; }
-/* page trail */
-@media print { span.trail { display: none; }}
-/* portrait support */
-img.portrait { float: left; clear: left; margin: 1ex; border:#999 1px solid; }
-div.footer, div.comment, hr { clear: both; }
-div.portrait { float: left; clear: left; font-size: xx-small; margin-right: 1em; }
-div.portrait img.portrait { float: none; margin: 0; }
-div.portrait a { text-decoration: none; color: #999; }
-div.color { clear: both; }
-div.one { background-color: #ddd; }
-/* referrer tracking */
-div.refer { padding-left:5%; padding-right:5%; font-size:smaller; }
-@media print { div.refer { display:none; }}
-/* usemod, tables, long tables */
-table.user { border-style:solid; border-width:thin; }
-table.user td, table.user th { border-style:solid; border-width:thin; padding:5px; }
-table.user th { font-weight:bold; }
-table.user td.r { text-align:right; }
-table.user td.l { text-align:left; }
-table.user td.c { text-align:center; }
-table.user td.j { text-align:justify; }
-table.user td.mark { background-color:yellow; }
-/* sidebar */
-div.sidebar { float: left; margin-right: 2em; margin-bottom: 3em; }

debian-packages

@@ -1,7 +0,0 @@
-#!/bin/sh
-# minimum
-apt-get install perl-modules
-# recommended
-apt-get install diff libwww-perl libxml-rss-perl
-# optional
-apt-get install libcgi-fast-perl

description

@@ -0,0 +1 @@
+Oddmuse

info-ref

@@ -1,202 +0,0 @@
-#!/usr/bin/perl
-# Copyright (C) 2005  Alex Schroeder <alex@emacswiki.org>
-#
-# 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
-
-use strict;
-use warnings;
-use CGI;
-use LWP::UserAgent;
-use XML::LibXML;
-use URI;
-
-my @indexes = qw(
-  http://www.gnu.org/software/emacs/manual/html_node/Command-Index.html
-  http://www.gnu.org/software/emacs/manual/html_node/Variable-Index.html
-  http://www.gnu.org/software/emacs/manual/html_node/Concept-Index.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_728.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_729.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_730.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_731.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_732.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_733.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_734.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_735.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_736.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_737.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_738.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_739.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_740.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_741.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_742.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_743.html
-  http://www.gnu.org/software/emacs/elisp-manual/html_node/elisp_744.html
-);
-
-my $db = '/org/org.emacswiki/htdocs/emacs/info-ref.dat';
-
-my $nl = "\n";
-my $fs = "\023";
-my $gs = "\024";
-my $rs = "\025";
-
-my $q = new CGI;
-ProcessRequest();
-
-sub ProcessRequest {
-  if ($q->param('init')) {
-    Initialize();
-  } elsif ($q->param('find')) {
-    Find($q->param('find'));
-  } else {
-    ShowForm();
-  }
-}
-
-sub ShowForm {
-  print $q->header, $q->start_html,
-    $q->start_form, "Index entry: ", $q->textfield('find'), $q->submit, $q->end_form,
-    $q->p('$Id: info-ref,v 1.6 2005/08/31 14:01:17 as Exp $'),
-    $q->end_html;
-}
-
-sub Find {
-  my $str = shift;
-  my %map = ();
-  my $data = ReadFileOrDie($db);
-  foreach my $line (split(/$nl/, $data)) {
-    my ($key, $rest) = split(/$fs/, $line);
-    $map{$key} = ();
-    foreach my $a (split(/$gs/, $rest)) {
-      my ($link, $label) = split(/$rs/, $a);
-      $map{$key}{$link} = $label;
-    }
-  }
-  my @links = keys %{$map{$str}};
-  if ($#links < 0) {
-    ReportError("No matches found for '$str'", '404 Not Found');
-  } elsif ($#links == 0) {
-    print $q->redirect($links[0]);
-  } else {
-    my @list = map { $q->a({-href=>$_}, $map{$str}{$_}) } @links;
-    print $q->header, $q->h1($str), $q->ol($q->li(\@list));
-  }
-}
-
-sub Initialize {
-  my %map = ();
-  print $q->header, $q->start_html;
-  foreach my $url (@indexes) {
-    print $q->p($url);;
-    # determine base URI
-    my $base = URI->new($url);
-    # fetch and parse data
-    my $data = GetRaw($url);
-    # some markup fixes for the elisp manual
-    $data =~ s/&([<"])/&amp;$1/g;
-    $data =~ s/<([<"])/&lt;$1/g;
-    $data =~ s/="fn_"">/="fn_&quot;">/;
-    $data =~ s/<!DOCTYPE.*?>//;
-    $data =~ s'</?font.*?>''gi;
-    $data =~ s'</table><br></P>'</table><br>';
-    my $parser = XML::LibXML->new();
-    my $doc;
-    eval { $doc = $parser->parse_html_string($data); };
-    print $q->p($@) if $@;
-    next if $@;
-    # emacs manual
-    my @nodelist = $doc->findnodes('/html/body/ul/li');
-    foreach my $node (@nodelist) {
-      my $text = $node->textContent;
-      my ($key) = split(/: /, $text);
-      my $a = $node->findnodes('descendant::a')->[0];
-      my $label = $a->textContent;
-      my $link = $a->getAttribute('href');
-      my $l = URI->new_abs($link, $base);
-      # print "$key -> $label $l\n";
-      $map{$key} = () unless $map{$key};
-      $map{$key}{$l->canonical} = $label;
-    }
-    # elisp manual
-    @nodelist = $doc->findnodes('descendant::table[position()=3]/descendant::tr');
-    foreach my $node (@nodelist) {
-      my ($item, $section) = $node->findnodes('td/a');
-      next unless $item and $section;
-      my $key = $item->textContent;
-      my $label = $section->textContent;
-      my $link = $item->getAttribute('href');
-      my $l = URI->new_abs($link, $base);
-      # print "$key -> $label $l\n";
-      $map{$key} = () unless $map{$key};
-      $map{$key}{$l->canonical} = $label;
-    }
-  }
-  my $data = join($nl, map {
-    my $key = $_;
-    $key . $fs . join($gs, map {
-      my $link = $_;
-      join($rs, $link, $map{$key}{$link});
-    } keys %{$map{$_}})
-  } keys %map);
-  WriteStringToFile($db, $data);
-  print $q->p('Database initialized'), $q->end_html;
-}
-
-sub GetRaw {
-  my $uri = shift;
-  return unless eval { require LWP::UserAgent; };
-  my $ua = LWP::UserAgent->new;
-  my $response = $ua->get($uri);
-  return $response->content;
-}
-
-sub ReadFile {
-  my ($filename) = @_;
-  my ($data);
-  local $/ = undef;   # Read complete files
-  if (open(IN, "<$filename")) {
-    $data=<IN>;
-    close IN;
-    return (1, $data);
-  }
-  return (0, '');
-}
-
-sub ReadFileOrDie {
-  my ($filename) = @_;
-  my ($status, $data);
-  ($status, $data) = ReadFile($filename);
-  if (!$status) {
-    ReportError("Cannot open $filename: $!", '500 Internal Server Error');
-  }
-  return $data;
-}
-
-sub WriteStringToFile {
-  my ($file, $string) = @_;
-  open(OUT, ">$file")
-    or ReportError("Cannot write $file: $!", '500 Internal Server Error');
-  print OUT  $string;
-  close(OUT);
-}
-
-sub ReportError { # fatal!
-  my ($errmsg, $status, $log) = @_;
-  print $q->header(-status => $status);
-  print $q->start_html, $q->h2($errmsg), $q->end_html;
-  exit (1);
-}

modules/.cvsignore

@@ -1 +0,0 @@
-.DS_Store

modules/404handler.pl

@@ -3,7 +3,7 @@
 #
 # 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
+# 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,
@@ -12,10 +12,7 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package OddMuse;
 
@@ -27,7 +24,7 @@ my @path = split(/\//, $ENV{REDIRECT_URL});
 my $file = $path[$#path];
 
 # for dynamic pages
-use vars qw($NotFoundHandlerExceptionsPage);
+our ($NotFoundHandlerExceptionsPage);
 $NotFoundHandlerExceptionsPage = 'NoCachePages';
 $RunCGI = 0;
 do $script;

modules/aawrapperdiv.pl

@@ -1,42 +0,0 @@
-# Copyright (C) 2004, 2005  Fletcher T. Penney <fletcher@freeshell.org>
-#
-# 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
-
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/aawrapperdiv.pl">aawrapperdiv.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/WrapperDiv_Module">WrapperDiv Module</a></p>';
-
-
-*OldGetHeader = *GetHeader;
-*GetHeader = *WrapperGetHeader;
-
-sub WrapperGetHeader {
-	my ($id, $title, $oldId, $nocache, $status) = @_;
-	my $result = OldGetHeader ($id, $title, $oldId, $nocache, $status);
-	$result .= $q->start_div({-class=>'wrapper'});
-}
-
-*OldPrintFooter = *PrintFooter;
-*PrintFooter = *WrapperPrintFooter;
-
-sub WrapperPrintFooter {
-	my ($id, $rev, $comment) = @_;
-	print $q->start_div({-class=>'wrapper close'});
-	print $q->end_div(), $q->end_div();
-	OldPrintFooter($id, $rev, $comment);
-}
-
-
-

modules/accesskeys.pl

@@ -0,0 +1,39 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+# Copyright (C) 2014  Alex Schroeder <alex@gnu.org>
+
+# 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/>.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('accesskeys.pl', 'Links With AccessKeys Extension');
+
+our (@MyRules, $FreeLinkPattern);
+
+push(@MyRules, \&LinksWithAccessKeys);
+sub LinksWithAccessKeys {
+  if (m/\G(\[\[$FreeLinkPattern\{(.)\}\]\])/cg) {
+    my ($id, $key) = ($2, $3);
+    Dirty($1);
+    $id = FreeToNormal($id);
+    my ($class, $resolved, $title, $exists) = ResolveId($id);
+    my $text = NormalToFree($id);
+    if ($resolved) { # anchors don't exist as pages, therefore do not use $exists
+      print ScriptLink(UrlEncode($resolved), $text, $class, undef, $title, $key);
+    } else {
+      print "[[" . QuoteHtml($text) . GetEditLink($id, '?') . "]]";
+    }
+    return ''; # this is a dirty rule that depends the definition of other pages
+  }
+  return; # the rule didn't match
+}

modules/admin.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,12 +11,14 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/admin.pl">admin.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Admin_Power_Extension">Admin Power Extension</a></p>';
+use strict;
+use v5.10;
+
+our ($q, %Page, %Action, $IndexFile, $PageDir, $KeepDir, @MyAdminCode, $RefererDir);
+
+AddModuleDescription('admin.pl', 'Admin Power Extension');
 
 $Action{delete} = \&AdminPowerDelete;
 $Action{rename} = \&AdminPowerRename;
@@ -31,15 +33,15 @@ sub AdminPowerDelete {
   OpenPage($id);
   my $status = DeletePage($id);
   if ($status) {
-    print $q->p(GetPageLink($id) . ' ' . T('not deleted: ')) . $status;
+    print $q->p(GetPageLink($id) . ' ' . T('not deleted:') . ' ' . $status);
   } else {
     print $q->p(GetPageLink($id) . ' ' . T('deleted'));
     WriteRcLog($id, Ts('Deleted %s', $id), 0, $Page{revision},
-	       GetParam('username', ''), GetRemoteHost(), $Page{languages},
+	       GetParam('username', ''), $q->remote_addr(), $Page{languages},
 	       GetCluster($Page{text}));
   }
   # Regenerate index on next request
-  unlink($IndexFile);
+  Unlink($IndexFile);
   ReleaseLock();
   print $q->p(T('Main lock released.'));
   PrintFooter();
@@ -56,38 +58,38 @@ sub AdminPowerRename {
   print $q->p(T('Main lock obtained.'));
   # page file -- only check for existing or missing pages here
   my $fname = GetPageFile($id);
-  ReportError(Ts('The page %s does not exist', $id), '400 BAD REQUEST') unless -f $fname;
+  ReportError(Ts('The page %s does not exist', $id), '400 BAD REQUEST') unless IsFile($fname);
   my $newfname = GetPageFile($new);
-  ReportError(Ts('The page %s already exists', $new), '400 BAD REQUEST') if -f $newfname;
+  ReportError(Ts('The page %s already exists', $new), '400 BAD REQUEST') if IsFile($newfname);
   # Regenerate index on next request -- remove this before errors can occur!
-  unlink($IndexFile);
+  Unlink($IndexFile);
   # page file
-  CreatePageDir($PageDir, $new); # It might not exist yet
-  rename($fname, $newfname)
+  CreateDir($PageDir); # It might not exist yet
+  Rename($fname, $newfname)
     or ReportError(Tss('Cannot rename %1 to %2', $fname, $newfname) . ": $!", '500 INTERNAL SERVER ERROR');
   # keep directory
   my $kdir = GetKeepDir($id);
   my $newkdir = GetKeepDir($new);
-  CreatePageDir($KeepDir, $new); # It might not exist yet (only the parent directory!)
-  rename($kdir, $newkdir)
+  CreateDir($KeepDir); # It might not exist yet (only the parent directory!)
+  Rename($kdir, $newkdir)
     or ReportError(Tss('Cannot rename %1 to %2', $kdir, $newkdir) . ": $!", '500 INTERNAL SERVER ERROR')
-      if -d $kdir;
+      if IsDir($kdir);
   # refer file
   if (defined(&GetRefererFile)) {
     my $rdir = GetRefererFile($id);
     my $newrdir = GetRefererFile($new);
-    CreatePageDir($RefererDir, $new); # It might not exist yet
-    rename($rdir, $newrdir)
+    CreateDir($RefererDir); # It might not exist yet
+    Rename($rdir, $newrdir)
       or ReportError(Tss('Cannot rename %1 to %2', $rdir, $newrdir) . ": $!", '500 INTERNAL SERVER ERROR')
-	if -d $rdir;
+	if IsDir($rdir);
   }
   # RecentChanges
   OpenPage($new);
   WriteRcLog($id, Ts('Renamed to %s', $new), 0, $Page{revision},
-	     GetParam('username', ''), GetRemoteHost(), $Page{languages},
+	     GetParam('username', ''), $q->remote_addr(), $Page{languages},
 	     GetCluster($Page{text}));
   WriteRcLog($new, Ts('Renamed from %s', $id), 0, $Page{revision},
-	     GetParam('username', ''), GetRemoteHost(), $Page{languages},
+	     GetParam('username', ''), $q->remote_addr(), $Page{languages},
 	     GetCluster($Page{text}));
   print $q->p(Tss('Renamed %1 to %2.', GetPageLink($id), GetPageLink($new)));
   ReleaseLock();

modules/adsense.pl

@@ -14,20 +14,24 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/adsense.pl">adsense.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/AdSense_Module">AdSense Module</a></p>';
+use strict;
+use v5.10;
 
-use vars qw($AdSensePageName $AdSensePlace);
+AddModuleDescription('adsense.pl', 'AdSense Module');
+
+our (@MyInitVariables, @MyFooters);
+our ($AdSensePageName, $AdSensePlace);
 
 push (@MyInitVariables, \&AdSenseInit);
 
 sub AdSenseInit {
   $AdSensePageName = "AdSense" unless $AdSensePageName;
-  $AdSensePlace = "top" unless $AdSensePlace;	   
+  $AdSensePlace = "top" unless $AdSensePlace;
   if ($AdSensePlace eq 'bottom') {  # Process adsense after all modules have been loaded
     push (@MyFooters, \&GetAdSense);
   } elsif ($AdSensePlace eq 'top')  {
-   *AdSenseOldGetHtmlHeader = *GetHtmlHeader;
-   *GetHtmlHeader = *AdSenseNewGetHtmlHeader;
+   *AdSenseOldGetHtmlHeader = \&GetHtmlHeader;
+   *GetHtmlHeader = \&AdSenseNewGetHtmlHeader;
   }
 }
 
@@ -40,4 +44,3 @@ sub AdSenseNewGetHtmlHeader {
 sub GetAdSense {
   return GetPageContent($AdSensePageName) if GetParam('action', 'browse') eq 'browse';
 }
-

modules/advanced-uploads.pl

@@ -0,0 +1,37 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+
+# 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/>.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('advanced-uploads.pl', 'Advanced File Upload Extension');
+
+our ($q, $HtmlHeaders);
+$HtmlHeaders .= '<script type="text/javascript" src="/js/uploader.js"></script>';
+
+*AdvancedUploadsOldGetTextArea = \&GetTextArea;
+*GetTextArea = \&AdvancedUploadsNewGetTextArea;
+
+sub AdvancedUploadsNewGetTextArea {
+  my ($name, $text, $rows) = @_;
+  return AdvancedUploadsOldGetTextArea(@_) . $q->br() . ($name =~ 'text|aftertext' ? GetUploadForm() : '');
+}
+
+sub GetUploadForm {
+    return $q->span({-class=>'upload'}, $q->label({-for=>'fileToUpload'}, T('Attach file:')),
+                    $q->filefield(-name=>'fileToUpload', -id=>'fileToUpload', -multiple=>'multiple', -onChange=>'fileSelected()', -size=>20),
+                    $q->span({-id=>'fileSize'}, ''),
+                    $q->button(-name=>'uploadButton', -value=>T('Upload'), -onClick=>'uploadFile()'),
+                    $q->span({-id=>'progressNumber'}));
+}

modules/age.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,14 +11,15 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/age.pl">age.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Age_Indication_Extension">Age Indication Extension</a></p>';
+use strict;
+use v5.10;
 
-use vars qw(%AgeEffect $AgeParameter);
+AddModuleDescription('age.pl', 'Age Indication Extension');
+
+our (%Page, $Now, $ScriptName);
+our (%AgeEffect, $AgeParameter);
 
 # map page age to theme
 %AgeEffect = (60*60*24 => 'day',
@@ -31,8 +32,8 @@ use vars qw(%AgeEffect $AgeParameter);
 # if using creationdate.pl.
 $AgeParameter = 'ts';
 
-*OldAgeGetHeader = *GetHeader;
-*GetHeader = *NewAgeGetHeader;
+*OldAgeGetHeader = \&GetHeader;
+*GetHeader = \&NewAgeGetHeader;
 
 sub NewAgeGetHeader {
   my $header = OldAgeGetHeader(@_);
@@ -46,7 +47,7 @@ sub NewAgeGetHeader {
     }
   }
   return $header unless $theme;
-  $oldtheme = GetParam('theme', $ScriptName);
+  my $oldtheme = GetParam('theme', $ScriptName);
   $header =~ s/class="$oldtheme"/class="$theme"/; # touch as little as possible
   return $header;
 }

modules/aggregate.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,17 +11,19 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/aggregate.pl">aggregate.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Front_Page_Extension">Front Page Extension</a></p>';
+use strict;
+use v5.10;
+
+AddModuleDescription('aggregate.pl', 'Front Page Extension');
+
+our ($q, $bol, %Action, %Page, $OpenPageName, $UseDiff, $UsePathInfo, $RssStyleSheet, $RssLicense, $RssRights, $RssImageUrl, $CommentsPrefix, $SiteName, $ScriptName, $HomePage, $SiteDescription, @MyRules, $LastUpdate, $InterWikiMoniker);
 
 push(@MyRules, \&AggregateRule);
 
 sub AggregateRule {
-  if ($bol && m/\G(&lt;aggregate\s+((("[^\"&]+",?\s*)+)|(sort\s+)?search\s+(.+?))&gt;)/gc) {
+  if ($bol && m/\G(&lt;aggregate\s+((("[^\"&]+",?\s*)+)|(sort\s+)?search\s+(.+?))&gt;)/cg) {
     Clean(CloseHtmlEnvironments());
     Dirty($1);
     my ($oldpos, $old_, $str, $sort, $search) = ((pos), $_, $3, $5, $6);
@@ -61,7 +63,7 @@ sub AggregateRule {
     ($_, pos) = ($old_, $oldpos); # restore \G (assignment order matters!)
     return '';
   }
-  return undef;
+  return;
 }
 
 $Action{aggregate} = \&DoAggregate;
@@ -121,8 +123,8 @@ sub DoAggregate {
       }
     }
     foreach my $id (@pages) {
-      my %data = ParseData(ReadFileOrDie(GetPageFile(FreeToNormal($id))));
-      my $page = $data{text};
+      my $data = ParseData(ReadFileOrDie(GetPageFile(FreeToNormal($id))));
+      my $page = $data->{text};
       my $size = length($page);
       my $i = index($page, "\n=");
       my $j = index($page, "\n----");
@@ -131,20 +133,15 @@ sub DoAggregate {
       $page =~ s/^=.*\n//; # if it starts with a header
       my $name = $id;
       $name =~ s/_/ /g;
-      my $date = TimeToRFC822($data{ts});
-      my $host = $data{host};
-      my $username = $data{username};
+      my $date = TimeToRFC822($data->{ts});
+      my $host = $data->{host};
+      my $username = $data->{username};
       $username = QuoteHtml($username);
       $username = $host unless $username;
-      my $minor = $data{minor};
-      my $revision = $data{revision};
+      my $minor = $data->{minor};
+      my $revision = $data->{revision};
       my $cluster = GetCluster($page);
-      my $description;
-      {
-	local *STDOUT;
-	open(STDOUT, '>', \$description) or die "Can't open memory file: $!";
-	ApplyRules(QuoteHtml($page), 1, 0, undef, 'p');
-      }
+      my $description = ToString(sub { ApplyRules(QuoteHtml($page), 1, 0, undef, 'p') });
       $description .= $q->p(GetPageLink($id, T('Learn more...')))
 	if length($page) < $size;
       $rss .= "\n<item>\n";

modules/agree-disagree.pl

@@ -0,0 +1,116 @@
+# Copyright (C) 2005  Bayle Shanks http://purl.net/net/bshanks
+#
+# 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/>.
+
+use strict;
+use v5.10;
+
+our ($Now, @MyMacros, @MyRules, $DefaultStyleSheet, $q, $bol);
+
+AddModuleDescription('agree-disagree.pl', 'AgreeDisagreePlugin');
+
+push(@MyRules, \&AgreeDisagreeSupportRule);
+
+push(@MyMacros, sub{ s/\[\+\]/"[+:" . GetParam('username', T('Anonymous'))
+                       . ':' . TimeToText($Now) . "]"/eg });
+push(@MyMacros, sub{ s/\[\+(:[^]:]+)\]/"[+$1:" . TimeToText($Now) . "]"/eg });
+push(@MyMacros, sub{ s/\[\-\]/"[-:" . GetParam('username', T('Anonymous'))
+                       . ':' . TimeToText($Now) . "]"/eg });
+push(@MyMacros, sub{ s/\[\-(:[^]:]+)\]/"[-$1:" . TimeToText($Now) . "]"/eg });
+
+
+$DefaultStyleSheet .= <<'EOT' unless $DefaultStyleSheet =~ /div\.agree/; # mod_perl?
+    div.agreeCount {
+ float: left;
+ clear: left;
+background-color: Green;
+padding-left: .5em;
+padding-right: .5em;
+padding-top: .5em;
+padding-bottom: .5em;
+}
+div.disagreeCount {
+  float: left;
+ clear: right;
+background-color: Red;
+padding-left: .5em;
+padding-right: .5em;
+padding-top: .5em;
+padding-bottom: .5em;
+}
+
+div.agreeNames {
+  float: left;
+background-color: Green;
+font-size: xx-small;
+ display: none;
+}
+div.disagreeNames {
+  float: left;
+background-color: Red;
+font-size: xx-small;
+ display: none;
+}
+
+
+
+EOT
+
+
+
+
+    my %AgreePortraits = ();
+
+
+sub AgreeDisagreeSupportRule {
+  if ($bol) {
+    if ($bol && m/(\G(\s*\[\+(.*?)\]|\s*\[-(.*?)\])+)/cgs) {
+
+      my $votes = $1;
+      my @ayes = ();
+      my @nayes = ();
+      while ($votes =~ m/\G.*?\[\+(.*?)\]/cgs) {
+        my ($ignore, $name, $time) = split(/:/, $1, 3);
+        push(@ayes, $name);
+      }
+      my $votes2 = $votes;
+      while ($votes2 =~ m/\G.*?\[-(.*?)\]/cgs) {
+        my ($ignore, $name, $time) = split(/:/, $1, 3);
+        push(@nayes, $name);
+      }
+
+      my $html = CloseHtmlEnvironments() ;
+      $html .= $q->div({-class=>'agreeCount'}) . ($#ayes+1) . '  ' . '</div>' ;
+
+      $html .= $q->div({-class=>'agreeNames'}) . printNames(@ayes) . '</div>' ;
+      $html .= $q->div({-class=>'disagreeCount'}) . '  ' . ($#nayes+1) . '</div>' ;
+      $html .= $q->div({-class=>'disagreeNames'}) . printNames(@nayes) . '</div>' ;
+
+
+      return $html;
+    }
+  }
+  return undef;
+}
+
+
+sub printNames {
+  my @names = @_;
+
+  my $html = '';
+  foreach my $name (@names)  {
+    $html .= "$name<br>";
+  }
+  return $html;
+}

modules/all.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,16 +11,18 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/all.pl">all.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/All_Action">All Action</a></p>';
+use strict;
+use v5.10;
+
+AddModuleDescription('all.pl', 'All Action');
+
+our ($q, %Action, $HomePage, $UrlProtocols);
 
 $Action{all} = \&DoPrintAllPages;
 
-my $Monolithic = 0;
+our $Monolithic = 0;
 
 sub DoPrintAllPages {
   return  if (!UserIsAdminOrError());
@@ -28,12 +30,12 @@ sub DoPrintAllPages {
   print GetHeader('', T('Complete Content'))
     . $q->p(Ts('The main page is %s.', $q->a({-href=>'#' . $HomePage}, $HomePage)));
   print $q->p($q->b(Ts('(for %s)', GetParam('lang', 0)))) if GetParam('lang', 0);
-  PrintAllPages(0, 0, undef, AllPagesList());
+  PrintAllPages(0, 0, undef, undef, AllPagesList());
   PrintFooter();
 }
 
-*OldAllScriptLink = *ScriptLink;
-*ScriptLink = *NewAllScriptLink;
+*OldAllScriptLink = \&ScriptLink;
+*ScriptLink = \&NewAllScriptLink;
 
 sub NewAllScriptLink {
   my ($action, $text, $class, $name, $title, $accesskey, $nofollow) = @_;
@@ -41,6 +43,7 @@ sub NewAllScriptLink {
       and $action !~ /^($UrlProtocols)\%3a/
       and $action !~ /^\%2f/
       and $action !~ /=/) {
+    my %params;
     $params{-href} = '#' . $action;
     $params{'-class'} = $class  if $class;
     $params{'-name'} = $name  if $name;

modules/anchors.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2005, 2009  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2004–2015  Alex Schroeder <alex@gnu.org>
 #
 # 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
@@ -12,18 +12,22 @@
 # You should have received a copy of the GNU General Public License along with
 # this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/anchors.pl">anchors.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Comments_on_Local_Anchor_Extension">Comments on Local Anchor Extension</a></p>';
+use strict;
+use v5.10;
 
+AddModuleDescription('anchors.pl', 'Local Anchor Extension');
+
+our ($q, %Page, $FootnoteNumber, $FreeLinkPattern, @MyRules, $BracketWiki);
 push(@MyRules, \&AnchorsRule);
 
 sub AnchorsRule {
-  if (m/\G\[\[\#$FreeLinkPattern\]\]/gc) {
+  if (m/\G\[\[\#$FreeLinkPattern\]\]/cg) {
     return $q->a({-href=>'#' . FreeToNormal($1), -class=>'local anchor'}, $1);
-  } elsif ($BracketWiki && m/\G\[\[\#$FreeLinkPattern\|([^\]]+)\]\]/gc) {
+  } elsif ($BracketWiki && m/\G\[\[\#$FreeLinkPattern\|([^\]]+)\]\]/cg) {
     return $q->a({-href=>'#' . FreeToNormal($1), -class=>'local anchor'}, $2);
-  } elsif ($BracketWiki && m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\|([^\]]+)\]\])/cog
-	   or m/\G(\[\[\[$FreeLinkPattern\#$FreeLinkPattern\]\]\])/cog
-	   or m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\]\])/cog) {
+  } elsif ($BracketWiki && m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\|([^\]]+)\]\])/cg
+	   or m/\G(\[\[\[$FreeLinkPattern\#$FreeLinkPattern\]\]\])/cg
+	   or m/\G(\[\[$FreeLinkPattern\#$FreeLinkPattern\]\])/cg) {
     # This one is not a dirty rule because the output is always a page
     # link, never an edit link (unlike normal free links).
     my $bracket = (substr($1, 0, 3) eq '[[[');
@@ -35,14 +39,30 @@ sub AnchorsRule {
     if (!$text && $bracket) {
       $text = BracketLink(++$FootnoteNumber); # s/_/ /g happens further down!
       $class .= ' number';
-      $title = $id; # override title
-      $title =~ s/_/ /g if $free;
+      # Since we're displaying a number such as [1], the title attribute should tell us where this will go.
+      $title = "$2 ($3)";
+      # The user might have writen [[[FooBar#one two]]] or [[[FooBar#one_two]]]
+      $title =~ s/_/ /g;
     }
     $text = $id unless $text;
     $text =~ s/_/ /g;
     return ScriptLink(UrlEncode($id), $text, $class, undef, $title);
-  } elsif (m/\G\[\:$FreeLinkPattern\]/gc) {
+  } elsif (m/\G\[\:$FreeLinkPattern\]/cg) {
     return $q->a({-name=>FreeToNormal($1), -class=>'anchor'}, '');
   }
-  return undef;
+  return;
+}
+
+*OldAnchorsBrowsePage=\&BrowsePage;
+*BrowsePage=\&NewAnchorsBrowsePage;
+
+sub NewAnchorsBrowsePage {
+  my ($id) = @_;
+  OpenPage($id);
+  if (not GetParam('revision', '')
+      and not GetParam('oldid', '')
+      and $Page{text} =~ /^\#REDIRECT\s+\[\[$FreeLinkPattern\#$FreeLinkPattern\]\]/) {
+    return ReBrowsePage(FreeToNormal($1 . '#' . $2), $id);
+  }
+  return OldAnchorsBrowsePage(@_);
 }

modules/antispam.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,14 +11,15 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/antispam.pl">antispam.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Antispam_Module">Antispam Module</a></p>';
+use strict;
+use v5.10;
 
-use vars qw($DoMaskEmail $CreateMailtoLinks); 
+AddModuleDescription('antispam.pl', 'Antispam Module');
+
+our (@MyRules);
+our ($DoMaskEmail, $CreateMailtoLinks, $EmailRegExp);
 
 $DoMaskEmail = 1;		# Mask all email, not just those in []'s
 $CreateMailtoLinks = 1;		# Create mailto's for all addresses
@@ -27,33 +28,33 @@ $EmailRegExp = '[\w\.\-]+@([\w\-]+\.)+[\w]+';
 
 
 push(@MyRules, \&MaskEmailRule);
-    
+
 sub MaskEmailRule {
 	# Allow [email@foo.bar Email Me] links
-	if (m/\G\[($EmailRegExp(\s\w+)*\s*)\]/igc) {
-		$chunk = $1;
+	if (m/\G\[($EmailRegExp(\s\w+)*\s*)\]/cgi) {
+		my $chunk = $1;
 		$chunk =~ s/($EmailRegExp)//i;
-		$email = $1;
+		my $email = $1;
 		$chunk =~ s/^\s*//;
 		$chunk =~ s/\s*$//;
-		
-		$masked="";
-		@decimal = unpack('C*', $email);
-		foreach $i (@decimal) {
-			$masked.="&#".$i.";";
+
+		my $masked = '';
+		my @decimal = unpack('C*', $email);
+		for (@decimal) {
+			$masked .= '&#' . $_ . ';';
 		}
 		$email = $masked;
 		$chunk = $email if $chunk eq "";
-		return "<a href=\"mailto:" . $email . "\">$chunk</a>";
+		return "<a href=\"mailto:$email\">$chunk</a>";
 	}
-	
-	if (m/\G($EmailRegExp)/igc) {
-		$email=$1;
+
+	if (m/\G($EmailRegExp)/cgi) {
+		my $email = $1;
 		if ($DoMaskEmail) {
-			$masked="";
-			@decimal = unpack('C*', $email);
-			foreach $i (@decimal) {
-				$masked.="&#".$i.";";
+			my $masked="";
+			my @decimal = unpack('C*', $email);
+			for (@decimal) {
+				$masked .= '&#' . $_ . ';';
 			}
 			$email = $masked;
 		}
@@ -62,5 +63,5 @@ sub MaskEmailRule {
 		}
 		return $email;
 	}
-	return undef;
+	return;
 }

modules/archive.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,15 +11,17 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/archive.pl">archive.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Archive_Extension">Archive Extension</a></p>';
+use strict;
+use v5.10;
 
-*OldArchiveGetHeader = *GetHeader;
-*GetHeader = *NewArchiveGetHeader;
+AddModuleDescription('archive.pl', 'Archive Extension');
+
+our ($q);
+
+*OldArchiveGetHeader = \&GetHeader;
+*GetHeader = \&NewArchiveGetHeader;
 
 # this assumes that *all* calls to GetHeader will print!
 sub NewArchiveGetHeader {
@@ -32,7 +34,7 @@ sub NewArchiveGetHeader {
   print $q->div({-class=>'archive'},
 		$q->p($q->span(T('Archive:')),
 		      map {
-			$key = $_;
+			my $key = $_;
 			my ($year, $month) = split(/-/, $key);
 			if (defined(&month_name)) {
 			  ScriptLink('action=collect;match=' . UrlEncode("^$year-$month"),

modules/askpage.pl

@@ -0,0 +1,69 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+#
+# 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/>.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('askpage.pl', 'Ask Page Extension');
+
+use Fcntl qw(:DEFAULT :flock);
+
+our ($DataDir, %Translate, @MyFooters);
+our ($AskPage, $QuestionPage, $NewQuestion);
+# Don't forget to set your $CommentsPattern to include both $AskPage and $QuestionPage
+$AskPage = 'Ask';
+$QuestionPage = 'Question_';
+$NewQuestion = 'Write your question here:';
+
+sub IncrementInFile {
+  my $filename = shift;
+  sysopen my $fh, encode_utf8($filename), O_RDWR|O_CREAT or die "can't open $filename: $!";
+  flock $fh, LOCK_EX or die "can't flock $filename: $!";
+  my $num = <$fh> || 1;
+  seek $fh, 0, 0 or die "can't rewind $filename: $!";
+  truncate $fh, 0 or die "can't truncate $filename: $!";
+  (print $fh $num+1, "\n") or die "can't write $filename: $!";
+  close $fh or die "can't close $filename: $!";
+  return $num;
+}
+
+*OldAskPageDoPost = \&DoPost;
+*DoPost = \&NewAskPageDoPost;
+sub NewAskPageDoPost {
+  my $id = FreeToNormal(shift);
+  if ($id eq $AskPage and not GetParam('text', undef)) { # comment, not a regular edit
+    my $currentQuestion = IncrementInFile("$DataDir/curquestion");
+    $currentQuestion =~ s/[\s\n]//g;
+    return OldAskPageDoPost($QuestionPage . $currentQuestion, @_); # hack page name
+  }
+  OldAskPageDoPost($id, @_); # keep original functionality for regular edits
+}
+
+*OldAskPageGetCommentForm = \&GetCommentForm;
+*GetCommentForm = \&NewAskPageGetCommentForm;
+@MyFooters = map { $_ == \&OldAskPageGetCommentForm ? \&NewAskPageGetCommentForm : $_ } @MyFooters;
+
+sub NewAskPageGetCommentForm {
+  my ($id) = @_;
+  $Translate{'Add your comment here:'} = $NewQuestion if $id eq $AskPage;
+  OldAskPageGetCommentForm(@_);
+}
+
+*OldAskPageJournalSort = \&JournalSort;
+*JournalSort = \&NewAskPageJournalSort;
+sub NewAskPageJournalSort {
+  return OldAskPageJournalSort() unless $a =~ m/^$QuestionPage\d+$/ and $b =~ m/^$QuestionPage\d+$/;
+  ($b =~ m/$QuestionPage(\d+)/)[0] <=> ($a =~ m/$QuestionPage(\d+)/)[0];
+}

modules/atom.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2006, 2008  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2004, 2006, 2008, 2014  Alex Schroeder <alex@gnu.org>
 #
 # 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
@@ -13,11 +13,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+use strict;
+use v5.10;
+
+use XML::Atom;
 use XML::Atom::Entry;
 use XML::Atom::Link;
 use XML::Atom::Person;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/atom.pl">atom.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Atom_Extension">Atom Extension</a></p>';
+AddModuleDescription('atom.pl', 'Atom Extension');
+
+our ($q, %Page, %Action, $CommentsPrefix, $ScriptName, $SiteName, $MaxPost, $UseDiff, $DeletedPage, @MyInitVariables, @MyMacros, $FS, $BannedContent, $RssStyleSheet, $RssRights, $RssLicense, $RssImageUrl, $RssExclude, $RCName, @UploadTypes, $UploadAllowed, $UsePathInfo, $SiteDescription, $LastUpdate, $InterWikiMoniker);
 
 push(@MyInitVariables, \&AtomInit);
 
@@ -55,7 +61,7 @@ sub DoAtomIntrospection {
   push(@types, @UploadTypes) if $UploadAllowed;
   my $upload = '<accept>' . join(', ', @types) . '</accept>';
   print <<EOT;
-<?xml version="1.0" encoding='$HttpCharset'?>
+<?xml version="1.0" encoding='UTF-8'?>
 <service xmlns="http://purl.org/atom/app#">
 <workspace title="Wiki" >
 <collection title="$SiteName" href="$ScriptName/atom/wiki">
@@ -79,7 +85,7 @@ sub GetRcAtom {
   my $historyPrefix = QuoteHtml($ScriptName) . "?action=history;id=";
   my $limit = GetParam("rsslimit", 15); # Only take the first 15 entries
   my $count = 0;
-  my $feed = qq{<?xml version="1.0" encoding="$HttpCharset"?>\n};
+  my $feed = qq{<?xml version="1.0" encoding="UTF-8"?>\n};
   if ($RssStyleSheet =~ /\.(xslt?|xml)$/) {
     $feed .= qq{<?xml-stylesheet type="text/xml" href="$RssStyleSheet" ?>\n};
   } elsif ($RssStyleSheet) {
@@ -98,6 +104,14 @@ sub GetRcAtom {
 		(ref $RssLicense eq 'ARRAY' ? @$RssLicense : $RssLicense));
   $feed .= AtomTag('wiki:interwiki', $InterWikiMoniker) if $InterWikiMoniker;
   $feed .= AtomTag('logo', $RssImageUrl) if $RssImageUrl;
+  my %excluded = ();
+  if (GetParam("exclude", 1)) {
+    foreach (split(/\n/, GetPageContent($RssExclude))) {
+      if (/^ ([^ ]+)[ \t]*$/) { # only read lines with one word after one space
+	$excluded{$1} = 1;
+      }
+    }
+  }
   # Now call GetRc with some blocks of code as parameters:
   ProcessRcLines(sub {}, sub {
       my ($pagename, $timestamp, $host, $username, $summary, $minor, $revision, $languages, $cluster) = @_;
@@ -111,7 +125,7 @@ sub GetRcAtom {
         . (GetParam('all', $cluster)
     	? QuoteHtml($ScriptName) . "?" . GetPageParameters('browse', $pagename, $revision, $cluster)
     	: $url . UrlEncode($pagename)) . qq{"/>\n};
-      $feed .= AtomLink("$ScriptName/atom/wiki/$id");
+      $feed .= AtomLink("$ScriptName/atom/wiki/$pagename");
       $feed .= AtomTag('summary', QuoteHtml($summary));
       $feed .= qq{<content type="xhtml">\n<div xmlns="http://www.w3.org/1999/xhtml">\n}
         . PageHtml($pagename, 50*1024,$q->div(T('This page is too big to send over RSS.')))
@@ -136,15 +150,15 @@ sub GetRcAtom {
 # Based on DoPost
 sub DoAtomSave {
   my ($type, $oldid) = @_;
-  my $entry = AtomEntry();
+  my $entry = AtomEntry($type);
   my $title = $entry->title();
   my $author = $entry->author();
   SetParam('username', $author->name) if $author; # Used in Save()
-  my $id = FreeToNormal($title) if ValidIdOrDie($title);
+  my $id = FreeToNormal($title);
+  UserCanEditOrDie($id);
   $oldid = $id unless $oldid;
   ValidIdOrDie($oldid);
   my $summary = $entry->summary();
-  ReportError(Ts('Editing not allowed for %s.', $id), '403 FORBIDDEN') unless UserCanEdit($id, 1);
   # Lock before getting old page to prevent races
   RequestLockOrError();		# fatal
   OpenPage($oldid);
@@ -173,7 +187,7 @@ sub DoAtomSave {
   my $oldrev = $Page{revision};
   if ($old eq $string and $oldid eq $id) {
     ReportError(T('No changes to be saved.'), '200 OK'); # an update without consequence
-  } elsif ($oldrev == 0 and ($string eq $NewText or $string eq "\n")) {
+  } elsif ($oldrev == 0 and $string eq "\n") {
     ReportError(T('No changes to be saved.'), '400 BAD REQUEST'); # don't fake page creation because of webdav
   } else {
     # My providing a different title, the entry is automatically renamed
@@ -217,15 +231,8 @@ sub DoAtomGet {
 }
 
 sub AtomEntry {
-  my $data = $q->param('POSTDATA');
-  if (not $data) {
-    # CGI provides POSTDATA for POST requests, not for PUT requests.
-    # The following code is based on the CGI->init code.
-    my $content_length = defined($ENV{'CONTENT_LENGTH'}) ? $ENV{'CONTENT_LENGTH'} : 0;
-    if ($content_length > 0 and $content_length < $MaxPost) {
-      $q->read_from_client(\$data, $content_length, 0);
-    }
-  }
+  my $type = shift || 'POST';
+  my $data = $q->param($type . 'DATA'); # PUTDATA or POSTDATA
   my $entry = XML::Atom::Entry->new(\$data);
   return $entry;
 }

modules/autolock.pl

@@ -1,4 +1,7 @@
 #!/usr/bin/env perl
+use strict;
+use v5.10;
+
 # ====================[ autolock.pl                        ]====================
 
 =head1 NAME
@@ -23,9 +26,9 @@ autolock is easily installable: move this file into the B<wiki/modules/>
 directory of your Oddmuse Wiki.
 
 =cut
-package OddMuse;
+AddModuleDescription('autolock.pl', 'Autolock Extension');
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/autolock.pl">autolock.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Autolock_Extension">Autolock Extension</a></p>';
+our (@MyInitVariables, $CommentsPrefix, $EditAllowed, $NoEditFile, %LockOnCreation);
 
 # ....................{ CONFIGURATION                      }....................
 
@@ -35,9 +38,9 @@ autolock is easily configurable: set these variables in the B<wiki/config.pl>
 file for your Oddmuse Wiki.
 
 =cut
-use vars qw($AutoLockPagesMatching
-            $AutoLockCommentsPagesMatching
-            $AutoLockSeverity
+our ($AutoLockPagesMatching,
+            $AutoLockCommentsPagesMatching,
+            $AutoLockSeverity,
             $AutoLockUserCanEditEditorFix);
 
 =head2 $AutoLockPagesMatching
@@ -133,13 +136,13 @@ sub AutoLockInit {
   }
 
   if ($AutoLockUserCanEditEditorFix) {
-    *UserCanEditAutoLockOld = *UserCanEditAutoLockFix;
+    *UserCanEditAutoLockOld = \&UserCanEditAutoLockFix;
   }
 }
 
 # ....................{ REDEFINITIONS                      }....................
-*UserCanEditAutoLockOld = *UserCanEdit;
-*UserCanEdit =            *UserCanEditAutoLock;
+*UserCanEditAutoLockOld = \&UserCanEdit;
+*UserCanEdit =            \&UserCanEditAutoLock;
 
 sub UserCanEditAutoLock {
   my ($page_name, $is_editing, $is_comment) = @_;
@@ -168,11 +171,11 @@ sub UserCanEditAutoLockFix {
   return 0 if $id eq 'SampleUndefinedPage' or $id eq T('SampleUndefinedPage')
     or $id eq 'Sample_Undefined_Page' or $id eq T('Sample_Undefined_Page');
   return 1 if UserIsAdmin() || UserIsEditor();
-  return 0 if $id ne '' and -f GetLockedPageFile($id);
-  return 0 if $LockOnCreation{$id} and not -f GetPageFile($id); # new page
-  return 0 if !$EditAllowed or -f $NoEditFile;
+  return 0 if $id ne '' and IsFile(GetLockedPageFile($id));
+  return 0 if $LockOnCreation{$id} and not IsFile(GetPageFile($id)); # new page
+  return 0 if !$EditAllowed or IsFile($NoEditFile);
   return 0 if $editing and UserIsBanned(); # this call is more expensive
-  return 0 if $EditAllowed >= 2 and (not $CommentsPrefix or $id !~ /^$CommentsPrefix/o);
+  return 0 if $EditAllowed >= 2 and (not $CommentsPrefix or $id !~ /^$CommentsPrefix/);
   return 1 if $EditAllowed >= 3 and ($comment or (GetParam('aftertext', '') and not GetParam('text', '')));
   return 0 if $EditAllowed >= 3;
   return 1;
@@ -203,18 +206,17 @@ except where noted.
 
 Copyleft 2008 by B.w.Curry <http://www.raiazome.com>.
 
-This file 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 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 file is distributed in the hope that it will be useful,
+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 file; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 =cut

modules/backlinkage.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,16 +11,19 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Grab MLDBM at http://search.cpan.org/dist/MLDBM/lib/MLDBM.pm
 # ie: http://search.cpan.org/CPAN/authors/id/C/CH/CHAMAS/MLDBM-2.01.tar.gz
 
+use strict;
+use v5.10;
+
+use Fcntl;
 use MLDBM qw( DB_File Storable );
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/backlinkage.pl">backlinkage.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Inline_Backlinks">Inline Backlinks</a></p>';
+AddModuleDescription('backlinkage.pl', 'Inline Backlinks');
+
+our ($q, %Action, %Page, @MyAdminCode, $DataDir, $LinkPattern);
 
 my $debug=1;             # Set Text Output Verbosity when compiling
 my $backfile = $DataDir . '/backlinks.db';  # Where data lives
@@ -38,8 +41,8 @@ sub BacklinksMenu {
 $Action{buildback} = \&BuildBacklinkDatabase;
 sub BuildBacklinkDatabase {
     print GetHttpHeader('text/plain');
-    unlink $backfile; # Remove old database
-    tie my %backhash, 'MLDBM', $backfile or die "Cannot open file $backfile $!\n";
+    Unlink($backfile); # Remove old database
+    tie my %backhash, 'MLDBM', encode_utf8($backfile) or die "Cannot open file $backfile $!\n";
     log1("Starting Database Store Process ... please wait\n\n");
 
     foreach my $name (AllPagesList()) {
@@ -54,9 +57,9 @@ sub BuildBacklinkDatabase {
             $hash->{'link' . $backlinkcount} = $link;
         }
         log2("$backlinkcount Links found in $name\n") if $backlinkcount;
-        $backhash{$name} = $hash;       # Store Hash data in HoH    
-    } 
-  
+        $backhash{$name} = $hash;       # Store Hash data in HoH
+    }
+
     if ($debug >= 3) {
         log4("Printing dump of USABLE Data we stored, sorted and neat\n");
         for my $source (sort keys %backhash) {
@@ -84,7 +87,7 @@ sub BacklinkProcess {
         if ($exists) {
             push (@backlinks,$resolved) unless (($seen{$resolved}++) or ($resolved eq $name));
         }
-    } 
+    }
     return @backlinks;
 }
 
@@ -92,14 +95,14 @@ sub BacklinkProcess {
 sub GetBackLink {
     my (@backlinks, @unpopped, @alldone);
     my $id = $_[0];
-    
-    use vars qw($BacklinkBanned);
+
+    our ($BacklinkBanned);
     $BacklinkBanned = "HomePage|ScratchPad" if !$BacklinkBanned;
-    tie my %backhash, 'MLDBM', $backfile, O_CREAT|O_RDWR, 0644 or die "Cannot open file $backfile $!\n";
+    tie my %backhash, 'MLDBM', encode_utf8($backfile), O_CREAT|O_RDWR, oct(644) or die "Cannot open file $backfile $!\n";
 
     # Search database for matches
-    while ( ($source, $hashes) = each %backhash ) {
-        while ( ($key, $value) = each %$hashes ) {
+    while ( my ($source, $hashes) = each %backhash ) {
+        while ( my ($key, $value) = each %$hashes ) {
             if ($id =~ /$value/) {
                 push (@backlinks, $source);
             }
@@ -111,14 +114,14 @@ sub GetBackLink {
     foreach my $backlink (@backlinks) {
             my ($class, $resolved, $title, $exists) = ResolveId($backlink);
             if (($resolved ne $id) && ($resolved !~ /^($BacklinkBanned)$/)) {
-                push(@unpopped, ScriptLink(UrlEncode($resolved), $resolved, $class . ' backlink', undef, T('Internal Page: ' . $resolved)));
+                push(@unpopped, ScriptLink(UrlEncode($resolved), $resolved, $class . ' backlink', undef, Ts('Internal Page: %s', $resolved)));
             }
     }
-    
+
     my $arraycount = @unpopped;
     return if !$arraycount; # Dont bother with the rest if empty results
-   
-    # Pop and Push data to make it look good (no trailing commas) 
+
+    # Pop and Push data to make it look good (no trailing commas)
     my $temp = pop(@unpopped);
     foreach my $backlink (@unpopped) {
             push(@alldone, $backlink . ", ");

modules/backlinks.pl

@@ -1,19 +1,24 @@
 # Copyright (C) 2008  Weakish Jiang <weakish@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as 
+# it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 #
 # You can get a copy of GPL version 2 at
 # http://www.gnu.org/licenses/gpl-2.0.html
 #
-# For user doc, see: 
+# For user doc, see:
 # http://www.oddmuse.org/cgi-bin/oddmuse/Backlinks_Extension
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/backlinks.pl">backlinks.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Backlinks_Extension">Backlinks Extension</a></p>';
+use strict;
+use v5.10;
 
-*OldGetSearchLink = *GetSearchLink;
-*GetSearchLink = *NewGetSearchLink;
+AddModuleDescription('backlinks.pl', 'Backlinks Extension');
+
+our ($q, %Action, %Page, $OpenPageName);
+
+*OldGetSearchLink = \&GetSearchLink;
+*GetSearchLink = \&NewGetSearchLink;
 sub NewGetSearchLink {
   my ($text, $class, $name, $title) = @_;
   my $id = UrlEncode(QuoteRegexp($text));
@@ -30,7 +35,7 @@ my $id = shift;
 my $search = GetParam('search', '');
 my $taglabel = $search;
    $taglabel =~ s/\\\[\\\[//;
-   $taglabel =~ s/\\\]\\\]//; 
+   $taglabel =~ s/\\\]\\\]//;
   ReportError(T('The search parameter is missing.')) unless $search;
   print GetHeader('', Ts('Pages link to %s', $taglabel), '');
   local (%Page, $OpenPageName);
@@ -46,6 +51,6 @@ my $taglabel = $search;
     }
     @found = map { $q->li(GetPageLink($_)) } @found;
     print $q->start_div({-class=>'search list'}),
-      $q->ul(@found), $q->end_div;  
+      $q->ul(@found), $q->end_div;
   PrintFooter();
-}  
+}

modules/ban-contributors.pl

@@ -0,0 +1,258 @@
+# Copyright (C) 2013-2016  Alex Schroeder <alex@gnu.org>
+
+# 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/>.
+
+=head1 Ban Contributors Extension
+
+This module adds "Ban contributors" to the administration page. If you
+click on it, it will list all the recent contributors to the page
+you've been looking at. Each contributor (IP or hostname) will be
+compared to the list of regular expressions on the C<BannedHosts> page
+(see C<$BannedHosts>). If the contributor is already banned, this is
+mentioned. If the contributor is not banned, you'll see a button
+allowing you to ban him or her immediately. If you click the button,
+the IP will be added to the C<BannedHosts> page for you.
+
+=cut
+use strict;
+use v5.10;
+
+our ($q, $Now, %Page, $OpenPageName, %Action, $UrlPattern, $BannedContent, $BannedHosts, @MyAdminCode);
+
+AddModuleDescription('ban-contributors.pl', 'Ban Contributors Extension');
+
+push(@MyAdminCode, \&BanMenu);
+
+sub BanMenu {
+  my ($id, $menuref, $restref) = @_;
+  if ($id and UserIsAdmin()) {
+    push(@$menuref, ScriptLink('action=ban;id=' . UrlEncode($id),
+			       T('Ban contributors')));
+  }
+}
+
+$Action{ban} = \&DoBanHosts;
+
+sub IsItBanned {
+  my ($it, $regexps) = @_;
+  my $re = undef;
+  foreach my $regexp (@$regexps) {
+    eval { $re = qr/$regexp/i; };
+    if (defined($re) && $it =~ $re) {
+      return $it;
+    }
+  }
+}
+
+sub DoBanHosts {
+  my $id = shift;
+  my $content = GetParam('content', '');
+  my $range = GetParam('range', '');
+  my $regexp = GetParam('regexp', '');
+  if ($content) {
+    SetParam('text', GetPageContent($BannedContent)
+	     . $content . " # " . CalcDay($Now) . " "
+	     . NormalToFree($id) . "\n");
+    SetParam('summary', NormalToFree($id));
+    DoPost($BannedContent);
+  } elsif ($regexp) {
+    SetParam('text', GetPageContent($BannedHosts)
+	     . $regexp . " # " . CalcDay($Now)
+	     . " $range "
+	     . NormalToFree($id) . "\n");
+    SetParam('summary', NormalToFree($id));
+    DoPost($BannedHosts);
+  } else {
+    ValidIdOrDie($id);
+    print GetHeader('', Ts('Ban Contributors to %s', NormalToFree($id)));
+    SetParam('rcidonly', $id);
+    SetParam('all', 1);
+    SetParam('showedit', 1);
+    my %contrib = ();
+    for my $line (GetRcLines()) {
+      $contrib{$line->[4]}->{$line->[5]} = 1 if $line->[4];
+    }
+    my @regexps = ();
+    foreach (split(/\n/, GetPageContent($BannedHosts))) {
+      if (/^\s*([^#]\S+)/) { # all lines except empty lines and comments, trim whitespace
+	push(@regexps, $1);
+      }
+    }
+    print '<div class="content ban">';
+    foreach (sort(keys %contrib)) {
+      my $name = $_;
+      delete $contrib{$_}{''};
+      $name .= " (" . join(", ", sort(keys(%{$contrib{$_}}))) . ")";
+      if (IsItBanned($_, \@regexps)) {
+	print $q->p(Ts("%s is banned", $name));
+      } else {
+	my ($start, $end) = BanContributors::get_range($_);
+	$range = "[$start - $end]";
+	$name .= " " . $range;
+	print GetFormStart(undef, 'get', 'ban'),
+	  GetHiddenValue('action', 'ban'),
+	  GetHiddenValue('id', $id),
+	  GetHiddenValue('range', $range),
+	  GetHiddenValue('regexp', BanContributors::get_regexp_ip($start, $end)),
+	  GetHiddenValue('recent_edit', 'on'),
+	  $q->p($name, $q->submit(T('Ban!'))), $q->end_form();
+      }
+    }
+  }
+  PrintFooter();
+}
+
+=head2 Rollback
+
+If you are an admin and rolled back a single page, this extension will
+list the URLs your rollback removed (assuming that those URLs are part
+of the spam) and it will allow you to provide a regular expression
+that will be added to BannedHosts.
+
+=cut
+
+*OldBanContributorsWriteRcLog = \&WriteRcLog;
+*WriteRcLog = \&NewBanContributorsWriteRcLog;
+
+sub NewBanContributorsWriteRcLog {
+  my ($tag, $id, $to) = @_;
+  if ($tag eq '[[rollback]]' and $id and $to > 0
+      and $OpenPageName eq $id and UserIsAdmin()) {
+    # we currently have the clean page loaded, so we need to reload
+    # the spammed revision (there is a possible race condition here)
+    my $old = GetTextRevision($Page{revision} - 1, 1)->{text};
+    my %urls = map {$_ => 1 } $old =~ /$UrlPattern/g;
+    # we open the file again to force a load of the despammed page
+    foreach my $url ($Page{text} =~ /$UrlPattern/g) {
+      delete($urls{$url});
+    }
+    # we also remove any candidates that are already banned
+    my @regexps = ();
+    foreach (split(/\n/, GetPageContent($BannedContent))) {
+      if (/^\s*([^#]\S+)/) { # all lines except empty lines and comments, trim whitespace
+	push(@regexps, $1);
+      }
+    }
+    foreach my $url (keys %urls) {
+      delete($urls{$url}) if IsItBanned($url, \@regexps);
+    }
+    if (keys %urls) {
+      print $q->p(Ts("These URLs were rolled back. Perhaps you want to add a regular expression to %s?",
+		     GetPageLink($BannedContent)));
+      print $q->pre(join("\n", sort keys %urls));
+      print GetFormStart(undef, 'get', 'ban'),
+	    GetHiddenValue('action', 'ban'),
+	    GetHiddenValue('id', $id),
+	    GetHiddenValue('recent_edit', 'on'),
+	    $q->p($q->label({-for=>'content'}, T('Regular expression:')), " ",
+		  $q->textfield(-name=>'content', -size=>30), " ",
+		  $q->submit(T('Ban!'))),
+	    $q->end_form();
+    };
+    print $q->p(T("Consider banning the IP number as well:"), ' ',
+		ScriptLink('action=ban;id=' . UrlEncode($id), T('Ban contributors')));
+  };
+  return OldBanContributorsWriteRcLog(@_);
+}
+
+package BanContributors;
+use Net::Whois::Parser qw/parse_whois/;
+
+sub get_range {
+  my $ip = shift;
+  my $response = parse_whois(domain => $ip);
+  my ($start, $end);
+  my $re = '(?:[0-9]{1,3}\.){3}[0-9]{1,3}';
+  my ($start, $end) = $response->{inetnum} =~ /($re) *- *($re)/;
+  return $start, $end;
+}
+
+sub get_groups {
+  my ($from, $to) = @_;
+  my @groups;
+  if ($from < 10) {
+    my $to = $to >= 10 ? 9 : $to;
+    push(@groups, [$from, $to]);
+    $from = $to + 1;
+  }
+  while ($from < $to) {
+    my $to = int($from/100) < int($to/100) ? $from + 99 - $from % 100 : $to;
+    if ($from % 10) {
+      push(@groups, [$from, $from + 9 - $from % 10]);
+      $from += 10 - $from % 10;
+    }
+    if (int($from/10) < int($to/10)) {
+      if ($to % 10 == 9) {
+	push(@groups, [$from, $to]);
+	$from = 1 + $to;
+      } else {
+	push(@groups, [$from, $to - 1 - $to % 10]);
+	$from = $to - $to % 10;
+      }
+    } else {
+      push(@groups, [$from - $from % 10, $to]);
+      last;
+    }
+    if ($to % 10 != 9) {
+      push(@groups, [$from, $to]);
+      $from = 1 + $to; # jump from 99 to 100
+    }
+  }
+  return \@groups;
+}
+
+sub get_regexp_range {
+  my @chars;
+  for my $group (@{get_groups(@_)}) {
+    my ($from, $to) = @$group;
+    my $char;
+    for (my $i = length($from); $i >= 1; $i--) {
+      if (substr($from, - $i, 1) eq substr($to, - $i, 1)) {
+	$char .= substr($from, - $i, 1);
+      } else {
+	$char .= '[' . substr($from, - $i, 1) . '-' . substr($to, - $i, 1). ']';
+      }
+    }
+    push(@chars, $char);
+  }
+  return join('|', @chars);
+}
+
+sub get_regexp_ip {
+  my ($from, $to) = @_;
+  my @start = split(/\./, $from);
+  my @end = split(/\./, $to);
+  my $regexp = "^";
+  for my $i (0 .. 3) {
+    if ($start[$i] eq $end[$i]) {
+      $regexp .= $start[$i];
+    } elsif ($start[$i] eq '0' and $end[$i] eq '255') {
+      last;
+    } elsif ($start[$i + 1] > 0) {
+      $regexp .= '(' . $start[$i] . '\.('
+	  . get_regexp_range($start[$i + 1], '255') . ')|'
+	  . get_regexp_range($start[$i] + 1, $end[$i + 1]) . ')';
+      $regexp .= '\.';
+      last;
+    } else {
+      $regexp .= '(' . get_regexp_range($start[$i], $end[$i]) . ')$';
+      last;
+    }
+    $regexp .= '\.' if $i < 3;
+  }
+  return $regexp;
+}
+
+# this is required in case we concatenate other modules to this one
+package OddMuse;
+

modules/ban-quick-editors.pl

@@ -0,0 +1,42 @@
+# Copyright (C) 2013–2015  Alex Schroeder <alex@gnu.org>
+#
+# 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/>.
+#
+# This file must load before logbannedcontent.pl such that quick
+# editors will be logged.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('ban-quick-editors.pl', 'Banning Quick Editors');
+
+our ($q, $Now, %RecentVisitors, $SurgeProtection);
+
+*BanQuickOldUserIsBanned = \&UserIsBanned;
+*UserIsBanned = \&BanQuickNewUserIsBanned;
+
+sub BanQuickNewUserIsBanned {
+  my $rule = BanQuickOldUserIsBanned(@_);
+  if (not $rule
+      and $SurgeProtection # need surge protection
+      and GetParam('title')) {
+    my $name = GetParam('username', $q->remote_addr());
+    my @entries = @{$RecentVisitors{$name}};
+    # $entry[0] is $Now after AddRecentVisitor
+    my $ts = $entries[1];
+    if ($Now - $ts < 5) {
+      return "fast editing spam bot";
+    }
+  }
+  return $rule;
+}

modules/banned-regexps.pl

@@ -0,0 +1,88 @@
+# Copyright (C) 2012  Alex Schroeder <alex@gnu.org>
+#
+# 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/>.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('banned-regexps.pl', 'Banning Regular Expressions');
+
+=encoding utf8
+
+=head1 Compatibility
+
+This extension works with logbannedcontent.pl.
+
+=head1 Example content for the BannedRegexps page:
+
+    # This page lists regular expressions that prevent the saving of a page.
+    # The regexps are matched against any page or comment submitted.
+    # The format is simple: # comments to the end of the line. Empty lines are ignored.
+    # Everything else is a regular expression. If the regular expression is followed by
+    # a comment, this is used as the explanation when a user is denied editing. If the
+    # comment starts with a date, this date is not included in the explanation.
+    # The date could help us decide which regular expressions to delete in the future.
+    # In other words:
+    # ^\s*([^#]+?)\s*(#\s*(\d\d\d\d-\d\d-\d\d\s*)?(.*))?$
+    # Group 1 is the regular expression to use.
+    # Group 4 is the explanation to use.
+
+    порно # 2012-12-31 Russian porn
+    <a\s+href=["']?http # 2012-12-31 HTML anchor tags usually mean spam
+    \[url= # 2012-12-31 bbCode links usually mean spam
+    \s+https?:\S+[ .\r\n]*$ # 2012-12-31 ending with a link usually means spam
+    (?s)\s+https?:\S+.*\s+https?:\S+.*\s+https?:\S+.* # 2012-12-31 three naked links usually mean spam
+
+=cut
+
+our (%AdminPages, %LockOnCreation, @MyInitVariables, %PlainTextPages, $BannedContent, $BannedFile,
+    $FullUrlPattern);
+our ($BannedRegexps);
+
+$BannedRegexps = 'BannedRegexps';
+
+push(@MyInitVariables, sub {
+       $AdminPages{$BannedRegexps} = 1;
+       $LockOnCreation{$BannedRegexps} = 1;
+       $PlainTextPages{$BannedRegexps} = 1;
+     });
+
+*RegexpOldBannedContent = \&BannedContent;
+*BannedContent = \&RegexpNewBannedContent;
+
+sub RegexpNewBannedContent {
+  my $str = shift;
+  # remove URLs as they are controlled by $BannedContent
+  $str =~ s/$FullUrlPattern//g;
+  my $rule = RegexpOldBannedContent($str, @_);
+  if (not $rule) {
+    foreach (split(/\n/, GetPageContent($BannedRegexps))) {
+      next unless m/^\s*([^#]+?)\s*(#\s*(\d\d\d\d-\d\d-\d\d\s*)?(.*))?$/;
+      my ($regexp, $comment, $re) = ($1, $4, undef);
+      eval { $re = qr/$regexp/i; };
+      if (defined($re) && $str =~ $re) {
+	my $group1 = $1;
+	my $explanation = ($group1
+			   ? Tss('Regular expression "%1" matched "%2" on this page.', QuoteHtml($regexp), $group1)
+			   : Ts('Regular expression "%s" matched on this page.', QuoteHtml($regexp)));
+        $rule = $explanation . ' '
+          . ($comment ? Ts('Reason: %s.', $comment) : T('Reason unknown.')) . ' '
+          . Ts('See %s for more information.', GetPageLink($BannedRegexps));
+        last;
+      }
+    }
+  }
+  LogWrite($rule) if $rule and $BannedFile;
+  return $rule if $rule;
+  return 0;
+}

modules/bbcode.pl

@@ -1,23 +1,27 @@
-# Copyright (C) 2007, 2008  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2007, 2008, 2013  Alex Schroeder <alex@gnu.org>
 #
-# 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 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.
+# 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/>.
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/bbcode.pl">bbcode.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/bbCode_Extension">bbCode Extension</a></p>';
+use strict;
+use v5.10;
 
+AddModuleDescription('bbcode.pl', 'bbCode Extension');
+
+our ($q, @HtmlStack, @MyRules, %RuleOrder, $UrlProtocols, $FullUrlPattern);
 push(@MyRules, \&bbCodeRule);
+$RuleOrder{\&bbCodeRule} = 100; # must come after PortraitSupportRule
 
-use vars qw($bbBlock);
+our ($bbBlock);
 my %bbTitle = qw(h1 1 h2 1 h3 1 h4 1 h5 1 h6 1);
 
 # This code does not allow the nesting of block elements such as quote
@@ -37,6 +41,12 @@ sub bbCodeRule {
 				. qq{font-style: normal;"}); }
     elsif ($tag eq 's' or $tag eq 'strike') {
       return AddHtmlEnvironment('del'); }
+    elsif ($tag eq 'tt') {
+      return AddHtmlEnvironment('tt'); }
+    elsif ($tag eq 'sub') {
+      return AddHtmlEnvironment('sub'); }
+    elsif ($tag eq 'sup') {
+      return AddHtmlEnvironment('sup'); }
     elsif ($tag eq 'color') {
       return AddHtmlEnvironment('em', qq{style="color: $option; }
 				. qq{font-style: normal;"}); }
@@ -51,12 +61,12 @@ sub bbCodeRule {
       return AddHtmlEnvironment('strong', qq{class="highlight"}); }
     elsif ($tag eq 'url') {
       if ($option) {
-	$option =~ /^($UrlProtocols)/o;
+	$option =~ /^($UrlProtocols)/;
 	my $class = "url $1";
 	return AddHtmlEnvironment('a', qq{href="$option" class="$class"}); }
-      elsif (/\G$FullUrlPattern\s*\[\/url\]/cogi) {
+      elsif (/\G$FullUrlPattern\s*\[\/url\]/cgi) {
 	return GetUrl($1); }}
-    elsif ($tag eq 'img' and /\G$FullUrlPattern\s*\[\/img\]/cogi) {
+    elsif ($tag eq 'img' and /\G$FullUrlPattern\s*\[\/img\]/cgi) {
       return GetUrl($1, undef, undef, 1); } # force image
     elsif ($tag eq 'quote') {
       my $html = CloseHtmlEnvironments();
@@ -93,10 +103,11 @@ sub bbCodeRule {
   elsif (/\G(\[\/([a-z][a-z1-6]*)\])/cgi) {
     my $bbcode = $1;
     my $tag = lc($2);
-    %translate = qw{b b i i u em color em size em font span url a
+    my %translate = qw{b b i i u em color em size em font span url a
 		    quote blockquote h1 h1 h2 h2 h3 h3 h4 h4 h5 h5
 		    h6 h6 center div left div right div list ul
-		    s del strike del highlight strong};
+		    s del strike del sub sub sup sup highlight strong
+		    tt tt};
     # closing a block level element closes all elements
     if ($bbBlock eq $translate{$tag}) {
       /\G([ \t]*\n)*/cg; # eat whitespace after closing block level element
@@ -114,15 +125,15 @@ sub bbCodeRule {
   # smiley
   elsif (/\G(:-?[()])/cg) {
     if (substr($1,-1) eq ')') {
-      # '☺' 0009786 00263a WHITE SMILING FACE, So, 0, ON, N,
-      return '&#x263a;'; }
+      # 😊 1F60A SMILING FACE WITH SMILING EYES
+      return '&#x1F60A;'; }
     else {
-      # '☹' 0009785 002639 WHITE FROWNING FACE, So, 0, ON, N,
-      return '&#x2639;'; }}
+      # 😟 1F61F WORRIED FACE
+      return '&#x1F61F;'; }}
   elsif (/\G:(?:smile|happy):/cg) {
-    return '&#x263a;'; }
+    return '&#x1F60A;'; }
   elsif (/\G:(?:sad|frown):/cg) {
-    return '&#x2639;'; }
+    return '&#x1F61F;'; }
   # no match
-  return undef;
+  return;
 }

modules/beautify.pl

@@ -1,50 +0,0 @@
-# Copyright (C) 2004  Xavier Maillard
-# Copyright (C) 2004  Alex Schroeder <alex@emacswiki.org>
-#
-# 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
-
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/beautify.pl">beautify.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Source_Code_Beautification_Extension">Source Code Beautification Extension</a></p>';
-
-use Beautifier::Core;
-use Output::HTML;
-
-push(@MyRules, \&BeautificationRule);
-
-sub BeautificationRule {
-  if ($bol and m/\G&lt;source\s+([a-zA-Z0-9]+)\s*&gt;\n?(.*?\n)&lt;\/source&gt;[ \t]*\n?/cgs) {
-    my $old_ = $_;
-    my $oldpos = pos;
-    my $lang = $1;
-    my $source= $2;
-    my $result = $source;
-    eval { $result = Beautify($lang, $source); };
-    $result = $@ if $@;
-    $_ = $old_;
-    pos = $oldpos;
-    return CloseHtmlEnvironments() . $q->div({-class=>'beauty'}, $result) . AddHtmlEnvironment('p');
-  }
-  return undef;
-}
-
-sub Beautify {
-  my ($lang, $source) = @_;
-  eval "use HFile::HFile_$lang";
-  my $Hfile = eval "new HFile::HFile_$lang";
-  return $q->strong(Ts('Cannot highlight the language %s.', $lang)) . "\n\n" . $source if $@;
-  my $highlighter = new Beautifier::Core($Hfile, new Output::HTML);
-  return $highlighter->highlight_text(UnquoteHtml($source));
-}

modules/big-brother.pl

@@ -13,16 +13,22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-package OddMuse;
+use strict;
+use v5.10;
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/big-brother.pl">big-brother.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Big_Brother_Extension">Big Brother Extension</a></p>';
+AddModuleDescription('big-brother.pl', 'Big Brother Extension');
 
-use vars qw($VisitorTime);
+our ($q, $Now, %Action, $SurgeProtectionViews, $SurgeProtectionTime, @MyAdminCode, $RCName, $VisitorFile, $FS);
+our ($VisitorTime, @BigBrotherSecretParameters);
 
 my $US  = "\x1f";
 
 $VisitorTime = 7200; # keep visitor data arround for 2 hours.
 
+# normal password parameter from wiki.pl
+# password parameters from login.pl
+@BigBrotherSecretParameters = qw(pwd pwd1 pwd2 oldpwd);
+
 push(@MyAdminCode, \&BigBrotherVisitors);
 
 sub BigBrotherVisitors {
@@ -47,7 +53,13 @@ sub AddRecentVisitor {
   $ts++ while $entries{$ts};
   my $action = GetParam('action', 'browse');
   my $id = GetId(); # script/p/q -> q
-  my $url = $q->url(-path_info=>1,-query=>1);
+  my %params = map { $_ => 1 } $q->param;
+  for my $bad (@BigBrotherSecretParameters) {
+    delete $params{$bad};
+  }
+  my $url = ScriptUrl(join(';', "action=$action;id=" . UrlEncode($id),
+			   map { $_ . '=' . UrlEncode(GetParam($_)) }
+			   keys %params));
   my $download = GetParam('action', 'browse') eq 'download'
     || GetParam('download', 0)
     || $q->path_info() =~ m/\/download\//;

modules/blockquote.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,25 +11,27 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/blockquote.pl">blockquote.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Comments_on_Text_Formatting_Rules">Comments on Text Formatting Rules</a></p>';
+use strict;
+use v5.10;
+
+AddModuleDescription('blockquote.pl', 'Comments on Text Formatting Rules');
+
+our ($bol, @MyRules);
 
 push(@MyRules, \&BlockQuoteRule);
 
 sub BlockQuoteRule {
   # indented text using : with the option of spanning multiple text
   # paragraphs (but not lists etc).
-  if (InElement('blockquote') && m/\G(\s*\n)+:[ \t]*/cog) {
+  if (InElement('blockquote') && m/\G(\s*\n)+:[ \t]*/cg) {
     return CloseHtmlEnvironmentUntil('blockquote')
       . AddHtmlEnvironment('p');
-  } elsif ($bol && m/\G(\s*\n)*:[ \t]*/cog) {
+  } elsif ($bol && m/\G(\s*\n)*:[ \t]*/cg) {
     return CloseHtmlEnvironments()
       . AddHtmlEnvironment('blockquote')
       . AddHtmlEnvironment('p');
   }
-  return undef;
+  return;
 }

modules/cal3.pl

@@ -1,89 +0,0 @@
-# Copyright (C) 2004  Alex Schroeder <alex@emacswiki.org>
-#               2004  Tilmann Holst <spam@tholst.de>
-#
-# 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
-
-# You may need to set $calcmd below.
-# Without the cal program (shipped with almost every unix) this extension
-# is useless. This extension will not work under Windows/IIS unless cal
-# is installed.
-
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/cal3.pl">cal3.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Cal3_Extension">Cal3 Extension</a></p>';
-
-*OldCalendarGetHeader = *GetHeader;
-*GetHeader = *NewCalendarGetHeader;
-
-sub NewCalendarGetHeader {
-  my ($csec, $cmin, $chour, $cmday, $cmon, $cyear) = gmtime();
-  $cyear += 1900;
-  $cmon += 1;
-
-  my qw($cal $prevmon $prevyear $nextmon $nextyear);
-  
-  # check if previous month is in previous year
-  if ($cmon == 1){
-    $prevmon = "12";
-    $prevyear = ($cyear - 1);
-  } else {
-    $prevmon = ($cmon - 1);
-    $prevyear = $cyear;
-  }
-  # check if next month is in next year
-  if ($cmon == "12") {
-    $nextmon = "1";
-    $nextyear = ($cyear + 1);
-  } else {
-  $nextmon = ($cmon + 1);
-  $nextyear = $cyear;
-  }
-  my $header = OldCalendarGetHeader(@_);
-
-  # commenting out the last line of this paragraph makes cal3 a cal2
-  # extension.
-  $cal = Cal($nextmon,$nextyear);
-  $cal .= Cal($cmon,$cyear);
-  $cal .= Cal($prevmon,$prevyear);
-
-  $header =~ s/<div class="header">/$cal<div class="header">/;
-  return $header;
-}
-
-sub Cal {
-  my ($month,$year) = @_;
-  # set $calcmd to an appropriate value
-  my $calcmd = 'cal'; # week starts with sunday
-  # my $calcmd = 'cal -m'; # week starts with monday
-  # my $calcmd = 'export LC_ALL=de_DE.UTF-8;/insert/path/here/cal -m'; # example with different path to cal and different locale
-  my $cal = `$calcmd $month $year`;
-  return unless $cal;
-  my ($sec, $min, $hour, $mday, $mon, $myyear) = gmtime($Now);
-  $cal =~ s|\b( ?\d?\d)\b|{
-    my $day = $1;
-    my $date = sprintf("%d-%02d-%02d", $year, $month, $day);
-    my $class;
-    if ($month == ($mon + 1)) {
-      $class = ($day == $mday) ? 'today'
-             : ($IndexHash{$date} ? 'exists' : 'wanted');
-    } else {
-      $class = ($IndexHash{$date} ? 'exists' : 'wanted');
-    }	      
-    "<a class=\"$class\" href=\"$ScriptName/$date\">$day</a>";
-    }|ge;
-  return "<div class=\"cal\"><pre>$cal</pre></div>";
-}
-
-

modules/calendar.pl

@@ -3,7 +3,7 @@
 #
 # 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
+# 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,
@@ -12,29 +12,45 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/calendar.pl">calendar.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Calendar_Extension">Calendar Extension</a></p>';
+use strict;
+use v5.10;
 
-use vars qw($CalendarOnEveryPage $CalAsTable $CalStartMonday);
+AddModuleDescription('calendar.pl', 'Calendar Extension');
+
+our ($q, %Page, %Action, $Now, $OpenPageName, $CollectingJournal, $FreeLinkPattern, @MyRules);
+our ($CalendarOnEveryPage, $CalAsTable, $CalStartMonday);
 
 $CalendarOnEveryPage = 0;   # 1=on every page is a month-div situated in the header, use css to control
+                            # 2=this month and the previous month; 3=this, previous and next month
 $CalAsTable = 0;            # 0=every month-div is "free", 1=every month-div is caught in a table, use css to control
 $CalStartMonday = 0;        # 0=week starts with Su, 1=week starts with Mo
 
-*OldCalendarGetHeader = *GetHeader;
-*GetHeader = *NewCalendarGetHeader;
+*OldCalendarGetHeader = \&GetHeader;
+*GetHeader = \&NewCalendarGetHeader;
 
 sub NewCalendarGetHeader {
   my $header = OldCalendarGetHeader(@_);
   return $header unless $CalendarOnEveryPage;
   my $action = GetParam('action', 'browse');
   return $header if grep(/^$action$/, ('calendar', 'edit'));
-  my $cal = Cal();
-  $header =~ s/<div class="header">/$cal<div class="header">/;
+  my $cal;
+  my ($sec, $min, $hour, $mday, $mon, $year) = localtime($Now);
+  $year += 1900;
+  # $mon is 0 based and thus good for previous month
+  if ($mon < 1) { $year -= 1; $mon += 12; };
+  $cal .= Cal($year, $mon) if $CalendarOnEveryPage > 1;
+  # the current month
+  $mon += 1;
+  if ($mon > 12) { $year += 1; $mon -= 12; };
+  $cal .= Cal($year, $mon) if $CalendarOnEveryPage;
+  # the next month
+  $mon += 1;
+  if ($mon > 12) { $year += 1; $mon -= 12; };
+  $cal .= Cal($year, $mon) if $CalendarOnEveryPage > 2;
+  # insert calendars before header div
+  $header =~ s!<div class="header">!<div class="cal">$cal</div><div class="header">!;
   return $header;
 }
 
@@ -51,7 +67,7 @@ sub Cal {
   }
   my @pages = AllPagesList();
   my $cal = draw_month($mon, $year);
-  $cal =~ s{( {1,2}\d{1,2})\b}{{
+  $cal =~ s{ ( ?\d{1,2})\b}{{
     my $day = $1;
     my $date = sprintf("%d-%02d-%02d", $year, $mon, $day);
     my $re = "^$date";
@@ -61,16 +77,16 @@ sub Cal {
     my $class = '';
     $class .= ' today' if $day == $mday_now and $mon == $mon_now and $year == $year_now;
     my @matches = grep(/$re/, @pages);
-    my $link;
+    my $link = ' ';
     if (@matches == 0) { # not using GetEditLink because of $class
-      $link = ScriptLink('action=edit;id=' . UrlEncode($page), $day, 'edit' . $class);
+      $link .= ScriptLink('action=edit;id=' . UrlEncode($page), $day, 'edit' . $class);
     } elsif (@matches == 1) { # not using GetPageLink because of $class
-      $link = ScriptLink($matches[0], $day, 'local exact' . $class);
+      $link .= ScriptLink($matches[0], $day, 'local exact' . $class);
     } else {
-      $link = ScriptLink('action=collect;match=' . UrlEncode($re), $day,  'local collection' . $class);
+      $link .= ScriptLink('action=collect;match=' . UrlEncode($re), $day,  'local collection' . $class);
     }
     $link;
-  }}ge;
+  }}eg;
   $cal =~ s{(\S+) (\d\d\d\d)}{{
     my ($month_text, $year_text) = ($1, $2);
     my $date = sprintf("%d-%02d", $year, $mon);
@@ -84,7 +100,7 @@ sub Cal {
 			    $year_text,  'local collection year'));
     }
   }}e;
-  return "<div class=\"cal month\"><pre>$cal</pre></div>";
+  return "<div class=\"month\"><pre>$cal</pre></div>";
 }
 
 $Action{collect} = \&DoCollect;
@@ -104,7 +120,7 @@ sub DoCollect {
     # Now save information required for saving the cache of the current page.
     local (%Page, $OpenPageName);
     print $q->start_div({-class=>'content journal collection'});
-    PrintAllPages(1, 1, undef, @pages);
+    PrintAllPages(1, 1, undef, undef, @pages);
     print $q->end_div();
   }
   $CollectingJournal = 0;
@@ -114,22 +130,22 @@ sub DoCollect {
 push(@MyRules, \&CalendarRule);
 
 sub CalendarRule {
-  if (/\G(calendar:(\d\d\d\d))/gc) {
+  if (/\G(calendar:(\d\d\d\d))/cg) {
     my $oldpos = pos;
     Clean(CloseHtmlEnvironments());
     Dirty($1);
     PrintYearCalendar($2);
     pos = $oldpos;
     return AddHtmlEnvironment('p');
-  } elsif (/\G(month:(\d\d\d\d)-(\d\d))/gc) {
+  } elsif (/\G(month:(\d\d\d\d)-(\d\d))/cg) {
     my $oldpos = pos;
     Clean(CloseHtmlEnvironments());
     Dirty($1);
-    print Cal($2, $3);
+    print $q->div({-class => 'cal'}, Cal($2, $3));
     pos = $oldpos;
     return AddHtmlEnvironment('p');
-  } elsif (/\G(month:([+-]\d\d?))/gc
-	  or /\G(\[\[month:([+-]\d\d?) $FreeLinkPattern\]\])/gc) {
+  } elsif (/\G(month:([+-]\d\d?))/cg
+	  or /\G(\[\[month:([+-]\d\d?) $FreeLinkPattern\]\])/cg) {
     my $oldpos = pos;
     Clean(CloseHtmlEnvironments());
     Dirty($1);
@@ -140,30 +156,30 @@ sub CalendarRule {
     $mon += 1 + $delta;
     while ($mon < 1) { $year -= 1; $mon += 12; };
     while ($mon > 12) { $year += 1; $mon -= 12; };
-    print Cal($year, $mon, undef, $id);
+    print $q->div({-class => 'cal'}, Cal($year, $mon, undef, $id));
     pos = $oldpos;
     return AddHtmlEnvironment('p');
   }
-  return undef;
+  return;
 }
 
 sub PrintYearCalendar {
   my $year = shift;
-  print $q->p({-class=>nav},
+  print $q->p({-class=>'nav'},
 	      ScriptLink('action=calendar;year=' . ($year-1), T('Previous')),
 	      '|',
 	      ScriptLink('action=calendar;year=' . ($year+1), T('Next')));
   if ($CalAsTable) {
       print '<table><tr>';
-      for $mon ((1..12)) {
+      for my $mon (1..12) {
         print '<td>'.Cal($year, $mon, 1).'</td>';
-        if (($mon==3) or ($mon==6) or ($mon==9)) {
+        if ($mon == 3 or $mon == 6 or $mon == 9) {
             print '</tr><tr>';
         }
       }
       print '</tr></table>';
   } else {
-      for $mon ((1..12)) {
+      for my $mon (1..12) {
         print Cal($year, $mon, 1);
       }
   }
@@ -234,7 +250,7 @@ sub draw_month {
 }
 
 # formula of Zeller (Julius Christian Johannes Zeller * 1822, + 1899) for countig the day of week
-# only works for all years greater then 0 and can handle 1582 the year Pope Gregor has changed the 
+# only works for all years greater then 0 and can handle 1582 the year Pope Gregor has changed the
 # calculation of times from the Julian calendar to the Gregorian calendar
 sub zeller {
     my $t = shift;

modules/canonical.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,15 +11,17 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/canonical.pl">canonical.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Canonical_Names">Canonical Names</a></p>';
+use strict;
+use v5.10;
 
-*OldCanonicalResolveId = *ResolveId;
-*ResolveId = *NewCanonicalResolveId;
+AddModuleDescription('canonical.pl', 'Canonical Names');
+
+use utf8;
+
+*OldCanonicalResolveId = \&ResolveId;
+*ResolveId = \&NewCanonicalResolveId;
 
 my %CanonicalName = ();
 
@@ -39,14 +41,9 @@ sub NewCanonicalResolveId {
 
 # If the page AlexSchröder exists, [[alexschroder]] will link to it.
 
-use utf8;
-use Encode;
 sub CanonicalName {
   my $str = shift;
-  $DebugInfo .= ' ' . $str;
-  $str = decode('utf-8', $str);
   $str =~ tr/äáàâëéèêïíìîöóòôüúùû/aaaaeeeeiiiioooouuuu/;
   $str = lc($str);
-  $DebugInfo .= '->' . $str;
   return $str;
 }

modules/cart.pl

@@ -0,0 +1,178 @@
+# Copyright (C) 2008 Eric Hsu <apricotan@gmail.com>
+
+# 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/>.
+
+use strict;
+use v5.10;
+use utf8;
+
+AddModuleDescription('cart.pl', 'Cart Extension');
+
+our ($q, %Action, $UserGotoBar, $CookieName);
+our ($CartPic, $CartName, %Cart, $ShowCart, @CartOrdered);
+my $LOADED_CART_JS;
+
+# ============
+# = cart-bfc =
+# ============
+
+# This is a simple shopping cart for pages!
+# Requires searchpaged-bfc.pl.
+
+# We make a checkbox that onChange, uses Yahoo! UI Cookie 2.6 (note we need 2.6!) routines to set a subcookie.
+# We have the cookie "$CartName" (by default $Cookiename . "Cart")
+# which holds the actual cart and is managed almost entirely
+# in client-side javascript. That means the checkboxes directly control the cookie.
+
+# If you want a little picture of a cart, you can set the URL at $CartPic.
+
+# InitCart loads the cookie values into %Cart. $Cart->{$pagename}=1 if it's in the cart.
+# In theory cookies are capped at 4K. Our page names are capped around 90ish chars. That leaves room for 40 maximal names in the cart. Probably enough.
+
+# We'll need the cookie values for
+# action=cart;subaction=show; along with other future subactions (download in latex, bibtex)
+# we'll feed this display to a variant of search display.
+# I'll have to check oddmuse.pl.
+
+# load Yahoo UI code bit to manage subcookies.
+
+$Action{cart} = \&DoCart;
+
+sub DoCart {
+  # foreach $key (keys %Cart) {
+  # 	push @cart, $key  if ($Cart{"$key"});
+  # }
+  DoSearch(\@CartOrdered);
+}
+
+$UserGotoBar .= '<a href="?action=cart;cache=0">View Cart</a>';
+
+# Manage Cart Routines
+
+#push @MyPrintSearchResultsPrefix, \&PrintCheckboxTableStart;
+#push @MyPrintSearchResultsSuffix, \&PrintCheckboxTableEnd;
+
+# I can't hack into Init, so let's tap into InitCookie.
+# We also tap into Cookie() to arrange writing out our cleaned up Cart.
+
+*OldInitCookie = *InitCookie;
+*InitCookie = *InitCookieAndCart;
+
+# To get a checkbox in the titles of pages, we patch GetHeader.
+*OldGetHeader = *GetHeader;
+*GetHeader = *GetHeaderAndCart;
+
+sub InitCookieAndCart {
+  OldInitCookie();
+  InitCart();
+}
+
+sub GetHeaderAndCart {
+  my ($id, $title, $oldId, $nocache, $status) = @_;
+  my $result = OldGetHeader(@_);
+
+  return ($result) unless ($id);
+
+  my $checkbox = MakeCheckbox($id);
+  $checkbox = qq(<span class="cart-checkbox" style="float:right">$checkbox</span>);
+
+  $result =~ s/(<\/h1>)/$checkbox$1/;
+
+  return ($result);
+}
+
+
+# We load the contents of our Cart cookie into the global %Cart and @CartOrdered
+sub InitCart {
+  $CartName = $CookieName . "Cart" unless (defined ($CartName) );
+  my @pairs;
+
+  %Cart = ();
+  @CartOrdered = ();
+
+  if ($q->cookie($CartName)) {
+    # @pairs = split(/&/, $q->cookie($CartName));
+    @pairs =  $q->cookie($CartName);
+    foreach my $pair (@pairs) {
+      # my $encodedequals = UrlEncode("=");
+      my ($name, $val)= split(/\=/, $pair);
+      $Cart{"$name"}=$val;
+      push @CartOrdered, $name;
+    }
+  }
+}
+
+sub PrintCheckboxTableStart {
+  my ($name, $regex, $text, $type) = @_;
+  my $html;
+
+  $html .= "<table><tr>";
+  my $checkbox = MakeCheckbox(@_);
+  $html .= qq(<td valign=top>$checkbox</td>);
+  $html .= "<td valign=top>";
+  print $html;
+}
+
+sub PrintCheckboxTableEnd {
+  my ($name, $regex, $text, $type) = @_;
+  my $html;
+
+  $html .= "</td>";
+  $html .= "</tr></table>";
+
+  print $html;
+}
+
+
+sub MakeCheckbox {
+  my ($name, $regex, $text, $type) = @_;
+  my $html;
+
+  return unless ($ShowCart);
+  unless ($LOADED_CART_JS) {
+    $html .= '<script type="text/javascript" src="http://yui.yahooapis.com/combo?2.7.0/build/yahoo/yahoo-min.js&2.7.0/build/cookie/cookie-min.js&2.7.0/build/event/event-min.js"></script>';
+    $LOADED_CART_JS=1;
+  }
+
+  my $selected = qq(checked="yes") if ($Cart{"$name"});
+
+	$html .=<<HTMLEND;
+	$CartPic<input type="checkbox" value="cart" id="$name-set" title="Add To Cart" $selected/> <br>
+	<script type="text/javascript">
+	(function(){
+	    YAHOO.util.Event.on("$name-set", "change", function(){
+	        var value = YAHOO.util.Cookie.getSub("$CartName", "$name");
+	        if (value == 1 ) { YAHOO.util.Cookie.removeSub("$CartName", "$name"); }
+	        else { YAHOO.util.Cookie.setSub("$CartName", "$name", 1 ); }
+	    });
+	})();
+	</script>
+HTMLEND
+
+  return $html unless ($q->param('action') eq 'edit' || $q->param('Preview'));
+  # no checkboxes for edit pages.
+  return;
+}
+
+__END__
+
+=
+(0.7) Load JS libraries on first checkbox (so won't load if we are editing).
+(0.6) Changed the JS source to be Yahoo's CDN.
+(0.51) Use CSS class cart-checkbox for the cart checkbox!  That way, we can remove them for printouts, for instance.
+(0.5) Our hack of cookies was not working cross-platform. We have a mismatch because our attempts to send out a cookie from oddmuse were getting the contents encoded and unreadable for the YUI routines.  Instead,we will use removeSub to avoid ever having to send the cookie back from our server!
+(0.4) Now every page title has a checkbox floated to the right, which controls the cart status.
+(0.3) Allow cart editing from cart display. Currently, doesn't seem to affect the cart.
+(0.2) Cart now displays.
+(0.1) Cart is now persistent and is edited by the checkboxes.

modules/checkbox.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,12 +11,14 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/checkbox.pl">checkbox.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Checklist_Extension">Checklist Extension</a></p>';
+use strict;
+use v5.10;
+
+AddModuleDescription('checkbox.pl', 'Checklist Extension');
+
+our ($q, $bol, @HtmlStack, %Action, %Page, $OpenPageName, @MyRules);
 
 # [[ : To do]]
 # [[X: Done]]
@@ -53,7 +55,7 @@ sub CheckBoxRule {
       return $1;
     }
   }
-  return undef;
+  return;
 }
 
 $Action{checkbox} = \&DoCheckBox;
@@ -72,7 +74,7 @@ sub DoCheckBox{
       $summary{$3} = 0 if $2 eq 'x' or $2 eq 'X';
       "${1}[[ :${3}]]";
     }
-  }eig;
+  }egi;
   SetParam('text', $text);
   SetParam('summary', join(', ', map {
     if ($summary{$_}) {

modules/clustermap.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,14 +11,17 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/clustermap.pl">clustermap.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/ClusterMap_Module">ClusterMap Module</a></p>';
+use strict;
+use v5.10;
 
-use vars qw($ClusterMapPage $ClusterMapTOC $FilterUnclusteredRegExp @ClusterMapAdminPages);
+AddModuleDescription('clustermap.pl', 'ClusterMap Module');
+
+our ($q, %Action, %Page, $OpenPageName, @MyRules, @MyAdminCode, $HomePage, $DeletedPage, $RCName, $InterMap, $BannedContent, $BannedHosts, %AdminPages, $RssExclude, @AdminPages, $NearMap);
+our ($ClusterMapPage, %ClusterMap, $ClusterMapTOC, $FilterUnclusteredRegExp, @ClusterMapAdminPages, $PrintTOCAnchor);
+
+my %Unclustered = ();
 
 $ClusterMapPage = "Site_Map" unless defined $ClusterMapPage;
 
@@ -32,16 +35,16 @@ $FilterUnclusteredRegExp = '\d\d\d\d-\d\d-\d\d|\d* *Comments on .*'
 # They are also added to the Important Pages list on the administration page
 @ClusterMapAdminPages = ( $HomePage, $DeletedPage, $BannedContent,
 	$BannedHosts, $InterMap, $NearMap, $RCName, $RssExclude)
-	
-	unless defined @ClusterMapAdminPages;
-	
+
+	unless @ClusterMapAdminPages;
+
 $ClusterMapTOC = 1 unless defined $ClusterMapTOC;
 $PrintTOCAnchor = 0;
 
 %ClusterMap = ();
 
-*OldDoRc = *DoRc;
-*DoRc = *ClusterMapDoRc;
+*OldPrintRcHtml = \&PrintRcHtml;
+*PrintRcHtml = \&ClusterMapPrintRcHtml;
 
 push(@MyAdminCode, \&ClusterMapAdminRule);
 
@@ -56,10 +59,10 @@ foreach (@ClusterMapAdminPages){
 }
 
 sub ClusterMapRule {
-	if (/\G^([\n\r]*\<\s*clustermap\s*\>\s*)$/mgc) {
+	if (/\G^([\n\r]*\<\s*clustermap\s*\>\s*)$/cgm) {
 		Dirty($1);
 		my $oldpos = pos;
-		$oldstr = $_;
+		my $oldstr = $_;
 		CreateClusterMap();
 		print "</p>";		# Needed to clean up, but could cause problems
 							# if <clustermap> isn't put into a new paragraph
@@ -69,8 +72,7 @@ sub ClusterMapRule {
 		$_ = $oldstr;
 		return '';
 	}
-	
-	return undef;
+	return;
 }
 
 
@@ -79,7 +81,7 @@ sub DoClusterMap {
 	# For each cluster, get list of all pages in that cluster
 	# Create map, using body of cluster pages, followed by titles of pages
 	#	within that cluster
-	
+
 	print GetHeader('',$ClusterMapPage,'');
 
 	CreateClusterMap();
@@ -94,21 +96,20 @@ sub DoClusterMap {
 		print '</ol></div>';
 		$PrintTOCAnchor = 1;
 	}
-	print '<div class="content">';	
-	PrintClusterMap(); 
-	
+	print '<div class="content">';
+	PrintClusterMap();
+
 	print '</div>';
 	PrintFooter();
 }
 
 sub DoUnclustered {
-	
 	print GetHeader('','Pages without a Cluster','');
 	print '<div class="content">';
-	
+
 	CreateClusterMap();
 	PrintUnclusteredMap();
-	
+
 	print '</div>';
 	PrintFooter();
 }
@@ -122,7 +123,7 @@ sub PrintClusterMap {
 		$free =~ s/_/ /g;
 
 		OpenPage($cluster);
-		
+
 		if ( FreeToNormal(GetCluster($Page{text})) eq $cluster ) {
 			# Don't display the page name twice if the cluster page is also
 			# a member of the cluster
@@ -137,7 +138,7 @@ sub PrintClusterMap {
 			print $q->h1(GetPageOrEditLink($free, $free));
 		}
 		PrintWikiToHTML($Page{text}, 0);
-		
+
 		print "<ul>";
 		foreach my $page (sort keys %{$ClusterMap{$cluster}}) {
 			my $title = $page;
@@ -150,57 +151,56 @@ sub PrintClusterMap {
 
 sub CreateClusterMap {
 	my @pages = AllPagesList();
-	
+
 	local %Page;
 	local $OpenPageName='';
-	
+
 	foreach my $page ( @pages) {
 		OpenPage($page);
 		my $cluster = FreeToNormal(GetCluster($Page{text}));
-		
+
 		next if ($cluster eq $DeletedPage);		# Don't map Deleted Pages
-		
+
 		next if (TextIsFile($Page{text}));		# Don't map files
-		
+
 		if ($cluster eq "") {					# Grab Unclustered Pages
 			$Unclustered{$page} = 1;
 			next;
 		}
-		
+
 		if ($cluster ne FreeToNormal($page)) {				# Create Cluster Map
 			$ClusterMap{$cluster}{$page} = 1;
 		}
 	}
-	
+
 	# Strip out Admin Pages
 	foreach my $page (@AdminPages) {
 		delete($Unclustered{$page});
 	}
 }
 
-sub ClusterMapDoRc {
+sub ClusterMapPrintRcHtml {
 	my ( @options ) = @_;
-	my $page = "";
-	my $cluster = GetParam(rcclusteronly);
-	
+	my $cluster = GetParam('rcclusteronly');
+
 	if ($cluster ne "") {
 		CreateClusterMap();
 		print "Pages in this cluster:";
 		print "<ul>";
-		foreach $page (sort keys %{$ClusterMap{$cluster}}) {
+		foreach my $page (sort keys %{$ClusterMap{$cluster}}) {
 			my $title = $page;
 			$title =~ s/_/ /g;
 			print "<li>" . ScriptLink($page, $title, 'local') . "</li>";
 		}
 		print "</ul>";
 	}
-	
-	OldDoRc(@options);
+
+	OldPrintRcHtml(@options);
 }
 
 sub PrintUnclusteredMap {
 		print "<ul>";
-		foreach $page (sort keys %Unclustered) {
+		foreach my $page (sort keys %Unclustered) {
 			my $title = $page;
 			$title =~ s/_/ /g;
 			if ($title !~ /^($FilterUnclusteredRegExp)$/) {
@@ -208,18 +208,17 @@ sub PrintUnclusteredMap {
 			}
 		}
 		print "</ul>";
-
 }
 
 sub ClusterMapAdminRule {
-	($id, $menuref, *restref) = @_;
-	
+	my ($id, $menuref) = @_;
+
 	push(@$menuref, ScriptLink('action=clustermap', T('Clustermap'), 'clustermap'));
 	push(@$menuref, ScriptLink('action=unclustered', T('Pages without a Cluster'), 'unclustered'));
 }
 
-*OldBrowseResolvedPage = *BrowseResolvedPage;
-*BrowseResolvedPage = *ClusterMapBrowseResolvedPage;
+*OldBrowseResolvedPage = \&BrowseResolvedPage;
+*BrowseResolvedPage = \&ClusterMapBrowseResolvedPage;
 
 sub ClusterMapBrowseResolvedPage {
 	my $title = shift;
@@ -228,7 +227,7 @@ sub ClusterMapBrowseResolvedPage {
 	if ($id eq $ClusterMapPage) {
 		CreateClusterMap();
 		print GetHeader('',$title,'');
-		print '<div class="content">';	
+		print '<div class="content">';
 		if ($ClusterMapTOC) {
 			my $TOCCount = 0;
 			print '<div class="toc"><h2>Categories</h2><ol>';
@@ -241,15 +240,15 @@ sub ClusterMapBrowseResolvedPage {
 			$PrintTOCAnchor = 1;
 		}
 		PrintClusterMap();
-		print '</div>';	
+		print '</div>';
 		PrintFooter();
 	} else {
 		OldBrowseResolvedPage($id);
 	}
 }
 
-*OldPrintWikiToHTML = *PrintWikiToHTML;
-*PrintWikiToHTML = *ClusterMapPrintWikiToHTML;
+*OldPrintWikiToHTML = \&PrintWikiToHTML;
+*PrintWikiToHTML = \&ClusterMapPrintWikiToHTML;
 
 sub ClusterMapPrintWikiToHTML {
 	my ($pageText, $savecache, $revision, $islocked) = @_;
@@ -260,7 +259,7 @@ sub ClusterMapPrintWikiToHTML {
 		&& ($pageText =~ /^\s*$/s)){
 		SetParam('rcclusteronly',0);
 		CreateClusterMap();
-		print '<div class="content">';	
+		print '<div class="content">';
 		if ($ClusterMapTOC) {
 			my $TOCCount = 0;
 			print '<div class="toc"><h2>Contents</h2><ol>';
@@ -272,7 +271,7 @@ sub ClusterMapPrintWikiToHTML {
 			$PrintTOCAnchor = 1;
 		}
 		PrintClusterMap();
-		print '</div>';	
+		print '</div>';
 	}
 	OldPrintWikiToHTML(@_);
 }

modules/comment-div-wrapper.pl

@@ -0,0 +1,57 @@
+# Copyright (C) 2014  Alex-Daniel Jakimenko <alex.jakimenko@gmail.com>
+# Copyright (C) 2014  Alex Schroeder <alex@gnu.org>
+
+# 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/>.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('comment-div-wrapper.pl', 'Comment Div Wrapper Extension');
+
+our ($q, $bol, $OpenPageName, @MyRules, %RuleOrder, $CommentsPrefix, $CommentsPattern, $FS);
+my $CommentDiv = 0;
+push(@MyRules, \&CommentDivWrapper);
+$RuleOrder{\&CommentDivWrapper} = -50;
+
+sub CommentDivWrapper {
+  if (substr($OpenPageName, 0, length($CommentsPrefix)) eq $CommentsPrefix) {
+    if (pos == 0 and not $CommentDiv) {
+      $CommentDiv = 1;
+      return $q->start_div({-class=>'userComment'});
+    }
+  }
+  if ($OpenPageName =~ /$CommentsPattern/) {
+    if ($bol and m/\G(\s*\n)*----+[ \t]*\n?/cg) {
+      my $html = CloseHtmlEnvironments()
+	  . ($CommentDiv++ > 0 ? $q->end_div() : $q->h2({-class=>'commentsHeading'}, T('Comments:'))) . $q->start_div({-class=>'userComment'})
+	  . AddHtmlEnvironment('p');
+      return $html;
+    }
+  }
+  return;
+}
+
+# close final div
+*OldCommentDivApplyRules = \&ApplyRules;
+*ApplyRules = \&NewCommentDivApplyRules;
+
+sub NewCommentDivApplyRules {
+  my ($blocks, $flags) = OldCommentDivApplyRules(@_);
+  if ($CommentDiv) {
+    print $q->end_div();
+    $blocks .= $FS . $q->end_div();
+    $flags .= $FS . 0;
+    $CommentDiv = 0;
+  }
+  return ($blocks, $flags);
+}

modules/commentcount.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,15 +11,17 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/commentcount.pl">commentcount.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Comment_Count_Extension">Comment Count Extension</a></p>';
+use strict;
+use v5.10;
 
-*OldCommentcountAddComment = *AddComment;
-*AddComment = *NewCommentcountAddComment;
+AddModuleDescription('commentcount.pl', 'Comment Count Extension');
+
+our ($CommentsPrefix);
+
+*OldCommentcountAddComment = \&AddComment;
+*AddComment = \&NewCommentcountAddComment;
 
 sub NewCommentcountAddComment {
   my ($old, $comment) = @_;
@@ -39,23 +41,23 @@ sub NewCommentcountAddComment {
   return $new;
 }
 
-*OldCommentcountScriptLink = *ScriptLink;
-*ScriptLink = *NewCommentcountScriptLink;
+*OldCommentcountScriptLink = \&ScriptLink;
+*ScriptLink = \&NewCommentcountScriptLink;
 
 sub NewCommentcountScriptLink {
   my ($action, $text, @rest) = @_;
-  if ($CommentsPrefix && $action =~ /^$CommentsPrefix(.*)/) {
+  if ($CommentsPrefix && $action =~ /^$CommentsPrefix(.*)/) { # TODO use $CommentsPattern ?
     # Add the number of comments here
     my $id = $action;
-    $id =~ s/%([0-9a-f][0-9a-f])/chr(hex($1))/ge; # undo urlencode
+    $id =~ s/%([0-9a-f][0-9a-f])/chr(hex($1))/eg; # undo urlencode
     my $comments = GetPageContent($id);
     my $num = 0;
     if($comments =~ /=== (\d+) Comments?\. ===/) {
       $num = $1;
     }
     # Fix plurals
-    my $plural = T('Comments on ');
-    my $singular = T('Comment on ');
+    my $plural = T('Comments on');
+    my $singular = T('Comment on');
     $text =~ s/$plural/$singular/ if($num == 1);
     $text = $num . ' ' . $text;
   }

modules/compilation.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -11,12 +11,14 @@
 # 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
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/compilation.pl">compilation.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Compilation_Extension">Compilation Extension</a></p>';
+use strict;
+use v5.10;
+
+AddModuleDescription('compilation.pl', 'Compilation Extension');
+
+our ($q, $bol, %Action, %Page, $OpenPageName, $CollectingJournal, @MyRules);
 
 $Action{compilation} = \&DoCompilation;
 
@@ -49,7 +51,7 @@ sub PrintCompilation {
     local %Page;
     local $OpenPageName='';
     print '<div class="compilation">';
-    PrintAllPages(1, 1, undef, @pages);
+    PrintAllPages(1, 1, undef, undef, @pages);
     print '</div>';
   }
   return @pages;
@@ -67,5 +69,5 @@ sub CompilationRule {
     pos = $oldpos;		# restore \G after call to ApplyRules
     return AddHtmlEnvironment('p');
   }
-  return undef;
+  return;
 }

modules/config.pl

@@ -1,108 +0,0 @@
-# Copyright (C) 2006  Alex Schroeder <alex@emacswiki.org>
-#
-# 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
-
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/config.pl">config.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Plans">Plans</a></p>';
-
-$Action{config} = \&DoConfig;
-$Action{clone} = \&DoClone;
-
-sub DoConfig {
-  print GetHttpHeader('text/plain') . qq{# Wiki Config
-# Source Wiki: $SiteName <$ScriptName>
-# } . TimeToText($Now) . qq{
-\$AdminPass = "";
-\$EditPass = "";
-};
-  my $source = GetRaw('http://www.emacswiki.org/scripts/current');
-  foreach my $var qw($HomePage $MaxPost $HttpCharset $StyleSheet
-		     $StyleSheetPage $NotFoundPg $NewText $NewComment
-		     $EditAllowed $BannedHosts $BannedCanRead
-		     $BannedContent $WikiLinks $FreeLinks $BracketText
-		     $BracketWiki $NetworkFile $AllNetworkFiles
-		     $PermanentAnchors $InterMap $NearMap
-		     $RssInterwikiTranslate $SurgeProtection
-		     $SurgeProtectionTime $SurgeProtectionViews
-		     $DeletedPage $RCName @RcDays $RcDefault $KeepDays
-		     $KeepMajor $SummaryHours $SummaryDefaultLength
-		     $ShowEdits $UseLookup $RecentTop $RecentLink
-		     $PageCluster $InterWikiMoniker $SiteDescription
-		     $RssImageUrl $RssRights $RssExclude
-		     $RssCacheHours $RssStyleSheet $UploadAllowed
-		     @UploadTypes $EmbedWiki $FooterNote $EditNote
-		     $TopLinkBar @UserGotoBarPages $UserGotoBar
-		     $ValidatorLink $CommentsPrefix $HtmlHeaders
-		     $IndentLimit $LanguageLimit $JournalLimit
-		     $SisterSiteLogoUrl %SpecialDays %Smilies
-		     %Languages) {
-    my $default = undef;
-    my $re = quotemeta($var);
-    if ($source =~ m!\n$re\s*=\s*(\d+(\s*[*+-/]\s*\d+)*|'[^']*'|"[^"]*"|\(.*?\)|qw\(.*?\))\s*;!) {
-      $default = $1;
-    }
-    $type = substr($var, 0, 1);
-    if ($type eq '$') {
-      my $val = eval($var);
-      print "$var = " . ConfigStr($val) . "; # default: $default\n"
-	if $val ne eval($default);
-    } elsif ($type eq '@') {
-      my @list = eval($var);
-      my @default = eval($default);
-      print "$var = (", join(', ', map { ConfigStr($_) } @list)
-	. "); # default: $default\n"
-	unless ConfigListEqual(\@list, \@default);
-    } elsif ($type eq '%') {
-      my %hash = eval($var);
-      my @default = eval($default);
-      print "$var = (", join(', ', map { ConfigStr($_)
-					   . ' => ' . ConfigStr($hash{$_})}
-			     keys %hash) . "); # default: $default\n"
-	unless ConfigHashEqual(\%hash, \%default);;
-    }
-  }
-  print "# Done!\n";
-}
-
-sub ConfigStr {
-  $_ = shift;
-  if (m/^\d+$/) {
-    $_;
-  } elsif (m/'/) {
-    "q{$_}";
-  } else {
-    "'$_'";
-  }
-}
-
-sub ConfigListEqual {
-  my ($a, $b) = @_;
-  return 0 if @$a != @$b;
-  for ($i = 0; $i < @$a; $i++) {
-    return 0 unless @$a[$i] eq @$b[$i];
-  }
-  return 1;
-}
-
-sub ConfigHashEqual {
-  my ($a, $b) = @_;
-  return 0 unless ConfigListEqual([keys %$a], [keys %$b]);
-  foreach my $key (keys %$a) {
-    next if $$a{$key} eq $$b{$key};
-    return 0;
-  }
-  return 1;
-}

modules/context.pl

@@ -2,7 +2,7 @@
 #
 # 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
+# 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,
@@ -13,8 +13,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$ModulesDescription .= '<p><a href="http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/context.pl">context.pl</a>, see <a href="http://www.oddmuse.org/cgi-bin/oddmuse/Calendar_Extension">Calendar Extension</a></p>';
+use strict;
+use v5.10;
 
+AddModuleDescription('context.pl', 'Calendar Extension');
+
+our ($q, @Debugging, $UserGotoBar, @MyInitVariables);
 push (@MyInitVariables, \&ContextMenuItem);
 
 sub ContextMenuItem {