banned-regexps: updated copyright year

BannedRegexps needs to check for BannedContent before it does
anything. BannedContent checks the URLs, and so BannedRegexps wants to
check everything except for the URLs. The order is important: the old
code used to remove the URLs before handing the text to BannedContent,
so it never found a thing. Changing the order fixed this.

.gitattributes

@@ -0,0 +1 @@
+*.pl linguist-language=Perl

.gitignore

@@ -8,3 +8,4 @@
 .DS_Store
 wiki.log
 .prove
+TAGS

Makefile

@@ -22,10 +22,10 @@ clean:
 	prove t/setup.pl
 
 release:
-	perl stuff/release ~/oddmuse.org
+	perl stuff/release ~/oddmuse.org/releases 2.3.3
 
 build/wiki.pl: wiki.pl
-	perl -lne "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') . ' ($(VERSION_NO)), see ' . \$$1/; print" < $< > $@
+	perl -lne "s/(\\\$$q->a\(\{-href=>'https:\/\/www.oddmuse.org\/'\}, 'Oddmuse'\))/\\\$$q->a({-href=>'https:\/\/alexschroeder.ch\/cgit\/oddmuse\/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" < $< > $@
@@ -36,8 +36,8 @@ build/national-%.pl: modules/translations/national-%.pl
 build/month-names-%.pl: modules/translations/month-names-%.pl
 	perl -lne "s/(AddModuleDescription\('[^']+', '[^']+')\)/\$$1, 'translations\/', '$(VERSION_NO)')/; print" < $< > $@
 
-# from: http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl
-#   to: http://git.savannah.gnu.org/cgit/oddmuse.git/tree/modules/namespaces.pl?id=2.1-11-gd4f1e27
+# 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" < $< > $@

README.creole

@@ -23,12 +23,21 @@ 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.
+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
@@ -85,7 +94,7 @@ Enjoy your wiki experience.
 Visit https://www.oddmuse.org/ to learn more about the translation
 files and modules that are part of this package.
 
-== Apache
+== Checking the Apache Setup
 
 If you think this information doesn't work for you, here are some things
 to check.
@@ -119,7 +128,7 @@ The default site is configured in
 sudo a2ensite default
 }}}
 
-This file also lists the directories we've used in out instructions
+This file also lists the directories we've used in our instructions
 above.
 
 {{{
@@ -136,6 +145,35 @@ 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}}}.
+Make sure you create the directory before starting the server!
+If you don't, you'll get a strange error:
+`STDERR: : No such file or directory at ... perl5/Mojolicious/Plugin/CGI.pm`.
+
+If it works, 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

contrib/campaignwiki/delete.sh

@@ -7,7 +7,7 @@ fi
 username=$1
 wiki=$2
 
-for p in $(curl "https://campaignwiki.org/wiki/$wiki?action=index;raw=1"); do
+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

contrib/emacswiki/bootstrap.js

@@ -0,0 +1,93 @@
+// Public Domain
+// initial version by Alex Schroeder <alex@gnu.org>
+// with many improvements by Evgkeni Sampelnikof
+
+$(function(){
+
+  // add fancy classes
+  $('div.header' ).addClass('container');
+  $('div.wrapper').addClass('container');
+  $('div.footer' ).addClass('container');
+  $('div.footer > .navbar' ).remove();
+  $('.message > p' ).addClass('alert');
+  $('img.portrait').addClass('img-polaroid');
+
+  $('input:text').addClass('input-medium search-query');
+  $('textarea').addClass('span12');
+  $('input:submit').addClass('btn');
+  $('.download a').addClass('btn btn-success');
+
+  $('.footer .gotobar').remove();
+  $('.footer br').first().remove();
+  var $gotobar = $('.gotobar')
+                   .after($('<div>').attr('class','navbar')
+                     .append($('<div>').attr('class','navbar-inner')
+                       .append($('<ul>').attr('class', 'nav'))));
+  var $id = $('h1 a').first().text();
+  var $list = $('.nav')
+                .append($('<li>')
+                  .append($('<a>').attr('class', 'brand').attr('href', 'http://www.emacswiki.org/')
+                    .append('Emacs Wiki')));
+  $('.gotobar a').each(function() {
+    var $item = $('<li>');
+    $(this).appendTo($item);
+    $item.appendTo($list);
+    if ($(this).text() == $id) {
+      $item.addClass('active');
+    }
+  });
+  $gotobar.remove();
+
+  // search without labels, without button, without language field
+  $('form.search input[type=submit]').remove();
+  $('form.search label').remove();
+  $('form.search input#searchlang').remove();
+  $('form.search')
+	.css({'float': 'right',
+	      'margin-top': '10px'});
+  $('.navbar').append($('form.search'));
+
+  // add button style to some links
+  $('.edit.bar a').addClass('btn');
+
+  // add color to Talk button for a non-existing page
+  $('a.btn.comment.edit').addClass('btn-warning');
+
+  // move article link and talk link below title
+  var $link = $('a.original').add('a.comment');
+  if ($link) {
+    $('.header h1').after($('<p>').append($link));
+  }
+
+  // toc
+    if ($('title').text() == "EmacsWiki: Wikified Emacs Lisp List") {
+	$('.content').addClass('ell');
+    }
+
+  // tables
+  $('table').addClass('table');
+
+  // minor edit checkbox
+  $('input[type=checkbox]').addClass('checkbox');
+  $('input[type=checkbox]').parent().addClass('checkbox');
+
+  // clean up admin page
+  $('li a.clear').parent().remove();
+  $('li a.index').parent().remove();
+
+  $('a[href="http://creativecommons.org/licenses/GPL/2.0/"]')
+    .parent()
+    .css({'margin-right': '120px',
+          'opacity': 0.3,
+          'padding-top': '1em'});
+  $('.footer .bar')
+    .after('<hr />');
+  var footer_wrapper = $('<div/>')
+    .addClass('footer_wrapper');
+  var footer = $('.footer.container');
+  footer.after(footer_wrapper);
+  footer_wrapper.append(footer);
+  var logo_image = $('<img />')
+    .attr('src', 'http://emacswiki.org/ew_logo.png');
+  $('.header .navbar .brand').html(logo_image);
+});

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/vc-oddmuse.el

@@ -1,165 +0,0 @@
-;;; vc-oddmuse.el -- add VC support to oddmuse-curl
-;; 
-;; Copyright (C) 2014  Alex Schroeder <alex@gnu.org>
-;; 
-;; Latest version:
-;;   http://git.savannah.gnu.org/cgit/oddmuse.git/plain/contrib/vc-oddmuse.el
-;; Discussion, feedback:
-;;   http://www.emacswiki.org/cgi-bin/wiki/OddmuseCurl
-;; 
-;; 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; Add the following to your init file:
-;;
-;; (add-to-list 'vc-handled-backends 'oddmuse)
-
-(add-to-list 'vc-handled-backends 'oddmuse)
-
-(require 'oddmuse-curl)
-(require 'diff)
-
-(defun vc-oddmuse-revision-granularity () 'file)
-
-(defun vc-oddmuse-registered (file)
-  "Handle files in `oddmuse-directory'."
-  (string-match (concat "^" (expand-file-name oddmuse-directory))
-		(file-name-directory file)))
-
-(defun vc-oddmuse-state (file)
-  "Return the current version control state of FILE.
-For a list of possible values, see `vc-state'."
-  ;; Avoid downloading the current version from the wiki and comparing
-  ;; the text: Too much traffic!
-  'edited)
-
-(defun vc-oddmuse-working-revision (file)
-  "The current revision based on `oddmuse-revisions'."
-  (with-oddmuse-file
-      (oddmuse-get-latest-revision wiki pagename)))
-
-(defun vc-oddmuse-checkout-model (files)
-  "No locking."
-  'implicit)
-
-(defun vc-oddmuse-create-repo (file)
-  (error "You cannot create Oddmuse wikis using Emacs."))
-
-(defun vc-oddmuse-register (files &optional rev comment)
-  "This always works.")
-
-(defvar vc-oddmuse-log-command
-  (concat "curl --silent %w"
-	  " --form action=rc"
-	  " --form showedit=1"
-	  " --form all=1"
-	  " --form from=1"
-	  " --form raw=1"
-	  " --form match='%r'")
-  "Command to use for publishing index pages.
-It must print the page to stdout.
-
-See `oddmuse-format-command' for the formatting options.")
-
-(defun vc-oddmuse-print-log (files buffer &optional shortlog start-revision limit)
-  "Load complete recent changes for the files."
-  ;; Derive `oddmuse-wiki' from the first file
-  (with-oddmuse-file (car files)
-    ;; The wiki expects a Perl regular expression!
-    (let ((regexp (concat "^(" (mapconcat 'file-name-nondirectory files "|") ")$")))
-      (oddmuse-run "Getting recent changes" vc-oddmuse-log-command nil nil buffer)))
-  (with-current-buffer buffer
-    (oddmuse-render-rss3))
-  'limit-unsupported)
-
-(defun vc-oddmuse-log-outgoing ()
-  (error "This is not supported."))
-
-(defun vc-oddmuse-log-incoming ()
-  (error "This is not supported."))
-
-(defvar vc-oddmuse-get-revision-command
-  (concat "curl --silent"
-	  " --form action=browse"
-	  " --form id=%t"
-	  " --form revision=%v"
-	  " --form raw=1"
-	  " '%w'")
-  "Command to use to get older revisions of a page.
-It must print the page to stdout.
-
-%?  '?' character
-%w  URL of the wiki as provided by `oddmuse-wikis'
-%t  Page title as provided by `oddmuse-page-name'
-%v  Revision to retrieve as provided by `oddmuse-revision'")
-
-(defun oddmuse-revision-filename (rev)
-  "Return filename for revision REV.
-This uses `oddmuse-directory', `wiki' and `pagename' as bound by
-`with-oddmuse-file'."
-  (concat oddmuse-directory
-	  "/" wiki
-	  "/" pagename
-	  ".~" rev "~"))
-
-(defun vc-oddmuse-diff (files &optional rev1 rev2 buffer)
-  "Report the differences for FILES."
-  (setq buffer (or buffer (get-buffer-create "*vc-diff*")))
-  (dolist (file files)
-    (with-oddmuse-file file
-      (setq rev1 (or rev1 (oddmuse-get-latest-revision wiki pagename)))
-      (dolist (rev (list rev1 rev2))
-	(when (and rev (not (file-readable-p (oddmuse-revision-filename rev))))
-	  (let* ((oddmuse-revision rev)
-		 (command vc-oddmuse-get-revision-command)
-		 (filename (oddmuse-revision-filename rev)))
-	    (with-temp-buffer
-	      (oddmuse-run
-	       (concat "Downloading revision " rev)
-	       command wiki pagename)
-	      (write-file filename)))))
-      (diff-no-select
-       (if rev1 (oddmuse-revision-filename rev1) file)
-       (if rev2 (oddmuse-revision-filename rev2) file)
-       nil
-       (vc-switches 'oddmuse 'diff)
-       buffer))))
-
-(defun vc-oddmuse-revert (file &optional contents-done)
-  "Revert FILE back to the wiki revision.
-If optional arg CONTENTS-DONE is non-nil, then nothing needs to
-be done, as the contents of FILE have already been reverted from
-a version backup."
-  (unless contents-done
-    (with-oddmuse-file file
-      (let ((command (oddmuse-format-command vc-oddmuse-get-revision-command)))
-	(with-temp-buffer
-	  (oddmuse-run "Loading" command wiki pagename)
-	  (write-file file))))))
-
-(defun vc-oddmuse-checkin (files rev comment)
-  "Commit changes in FILES to this backend.
-REV is a historical artifact and should be ignored.  COMMENT is
-used as a check-in comment."
-  (dolist (file files)
-    (with-oddmuse-file file
-      (let* ((summary comment)
-	     (command (oddmuse-format-command oddmuse-post-command))
-	     (buf (get-buffer-create " *oddmuse-response*")))
-	(with-temp-buffer
-	  (insert-file-contents file)
-	  (oddmuse-run "Posting" command wiki pagename buf t 302))))))
-
-(provide 'vc-oddmuse)

css/alex-2017.css

@@ -0,0 +1,544 @@
+/* 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;
+}
+
+@import url(file:///home/alex/alexschroeder.ch/css/alex-2017.css) print;
+
+@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 {
+    border: none;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    padding: 1em;
+    margin: 1em 2em;
+}
+table tr td, table 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; }
+
+/* mastodon */
+
+div.mastodon { padding: 0 2em }
+div.mastodon .status {padding-top: 1ex; border-bottom: 1px solid grey;}
+div.mastodon .status:first-child {border-top: 1px solid grey;}
+
+/* rss */
+
+channel * { display: block; }
+
+channel title {
+    margin-top: 30pt;
+}
+copyright {
+    font-size: 14pt;
+    margin-top: 1em;
+}
+channel:before {
+    font-size: 14pt;
+    display: block;
+    margin: 1em;
+    padding: 0.5em;
+    content: "This document is to be read in a feed reader. The item content is escaped HTML, which makes it hard to read for humans. Sorry!";
+    color: red;
+    border: 1px solid red;
+}
+license {
+    font-size: 11pt;
+    margin-bottom: 9pt;
+}
+contributor:before { content: "Last edited by "; }
+contributor:after { content: "."; }
+generator:before { content: "Feed generated by "; }
+generator:after { content: "."; }
+channel description {
+    font-weight: bold;
+}
+item description {
+    font-weight: normal;
+    margin-bottom: 1em;
+}
+link, managingEditor, webMaster, license, url,
+docs, language,
+pubDate, lastBuildDate, ttl, guid, category, comments,
+docs, image title, image link,
+status, version, diff, history, importance {
+    display: none;
+}

css/alex-2018.css

@@ -0,0 +1,615 @@
+/* This file is in the public domain. */
+html{ text-align: center; }
+
+body, rss {
+    font-family: "DejaVu Serif", Palatino, serif;
+    font-style: normal;
+    font-size: 16pt;
+    padding: 1em 3em;
+    max-width: 72ex;
+    display: inline-block;
+    text-align: left;
+    color: #000;
+    background-color: #fff;
+}
+
+@media only screen and (max-device-width: 600px) {
+    body {
+	padding: 1ex;
+    }
+    textarea {
+	font-size: inherit;
+    }
+}
+
+/* code */
+
+textarea, pre, code, tt {
+    font-family: "DejaVu Mono", "Andale Mono", Monaco, "Courier New", Courier, monospace;
+}
+
+pre, code, tt {
+    font-size: 12pt; /* fits 80ex */
+}
+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+ */
+}
+
+@import url(file:///home/alex/alexschroeder.ch/css/alex-2017.css) print;
+
+@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;
+}
+
+.header input {
+    width: 10ex;
+}
+
+/* other form fields */
+
+input[type="text"] {
+    padding: 0;
+    font-size: 80%;
+    line-height: 125%;
+}
+
+/* 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;
+}
+
+/* Recent Changes */
+
+div.rc {
+    overflow: hidden;
+}
+div.rc li + li {
+    margin-top: 1em;
+}
+div.rc li strong, table.history strong, strong.description {
+    font-family: inherit;
+    font-weight: inherit;
+}
+.red {
+    background: red;
+    color: red;
+}
+
+.orange {
+    background: orange;
+    color: orange;
+}
+
+.yellow {
+    background: yellow;
+    color: yellow;
+}
+
+.green {
+    background: green;
+    color: green;
+}
+
+.blue {
+    background: blue;
+    color: blue;
+}
+
+.indigo {
+    background: indigo;
+    color: indigo;
+}
+
+.violet {
+    background: violet;
+    color: violet;
+}
+
+.white {
+    background: white;
+    color: white;
+}
+
+.ip-code {
+    border: 1px solid #666;
+}
+
+/* Diff */
+
+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 {
+    border: none;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+    padding: 1em;
+    margin: 1em 2em;
+}
+table tr td, table 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; }
+
+/* mastodon */
+
+div.mastodon { padding: 0 2em }
+div.mastodon .status {padding-top: 1ex; border-bottom: 1px solid grey;}
+div.mastodon .status:first-child {border-top: 1px solid grey;}
+
+/* terminal "screenshots" */
+
+.terminal {
+    width: 80%;
+    margin: 50px auto 100px auto;
+    padding: 5px;
+    font-size: 62%; /* fits 80ex */
+    border: 1px solid #999;
+    border-radius: 5px;
+    box-shadow: 0px 25px 50px #999;  
+}
+
+/* rss */
+
+channel * { display: block; }
+
+channel title {
+    margin-top: 30pt;
+}
+copyright {
+    font-size: 14pt;
+    margin-top: 1em;
+}
+channel:before {
+    font-size: 14pt;
+    display: block;
+    margin: 1em;
+    padding: 0.5em;
+    content: "This document is to be read in a feed reader. The item content is escaped HTML, which makes it hard to read for humans. Sorry!";
+    color: red;
+    border: 1px solid red;
+}
+license {
+    font-size: 11pt;
+    margin-bottom: 9pt;
+}
+contributor:before { content: "Last edited by "; }
+contributor:after { content: "."; }
+generator:before { content: "Feed generated by "; }
+generator:after { content: "."; }
+channel description {
+    font-weight: bold;
+}
+item description {
+    font-weight: normal;
+    margin-bottom: 1em;
+}
+link, managingEditor, webMaster, license, url,
+docs, language,
+pubDate, lastBuildDate, ttl, guid, category, comments,
+docs, image title, image link,
+status, version, diff, history, importance {
+    display: none;
+}

css/light.css

@@ -27,6 +27,10 @@ textarea, pre, code, tt {
 		font-family: Times, serif;
 		font-size:10pt;
 	}
+	/* Printing from Firefox */
+	svg {
+	    transform: translate(-1.5cm, -1cm);
+	}
 }
 
 /* iPhone */
@@ -49,7 +53,8 @@ textarea, pre, code, tt {
 /* 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: 5em; font-size: 80%; }
+.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%; }
 

css/wiki.css

@@ -51,13 +51,13 @@ a.image:hover img {
 }
 
 /* a.definition soll aussehen wie h2 */
-h2, p a.definition {
+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 {
+h1, h2, h3, h4, h1 a, h1 a:visited, p > a.definition {
     color: #666;
     font-size: 30pt;
     font-weight: normal;
@@ -172,6 +172,50 @@ span.bar a {
     padding: 1ex 0;
 }
 
+.red {
+    background: red;
+    color: red;
+}
+
+.orange {
+    background: orange;
+    color: orange;
+}
+
+.yellow {
+    background: yellow;
+    color: yellow;
+}
+
+.green {
+    background: green;
+    color: green;
+}
+
+.blue {
+    background: blue;
+    color: blue;
+}
+
+.indigo {
+    background: indigo;
+    color: indigo;
+}
+
+.violet {
+    background: violet;
+    color: violet;
+}
+
+.white {
+    background: white;
+    color: white;
+}
+
+.ip-code {
+    border: 1px solid #666;
+}
+
 hr {
     border: none;
     color: black;
@@ -219,3 +263,19 @@ code {
     background: #eee;
     white-space: pre-wrap;
 }
+
+/* for https://oddmuse.org/wiki/All_Modules */
+.foo_list + .journal h1 {
+    font: inherit;
+    border: none;
+    display: list-item;
+    margin-top: 0;
+    margin-left: 1em;
+}
+
+.foo_list + .journal a {
+    font: inherit;
+    border: none;
+    text-decoration: none;
+    color: #a00;
+}

logo/falky/README.md

@@ -0,0 +1,15 @@
+Falky schreibt:
+
+Zum Thema Rechte am Logo möchte ich erstmal sagen, dass es mir primär
+darum ging den Auftritt von oddmuse.org aufzuhübschen. Also du/ihr
+sollt durch das Logo unterstützt werden, nicht eingeschränkt.
+
+Welche Lizenz das ab besten leisten, da hab ich keinen Schimmer.
+
+Schön wäre, wenn irgendwo ein verweis auf "Falky [falky.de]"
+auftaucht, der soll aber nicht bei jeder Verwendung auftauchen,
+sondern irgendwo 'auffindbar' an 'zentraler' Stelle - halt irgendwo
+auf der Homepage, dass ich darauf verweisen kann und dass niemand was
+anderes behaupten kann. Das wäre es schon. Und ja, falls jemand das
+logo für ein anderes Projekt verwenden möchte, kann man ja höflich
+nochmal fragen oder so.

logo/falky/oddmuse.banner.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-61 -1 177 62">
+
+<rect fill="#FFF" x="-60" y="0" width="175" height="60"/>
+
+<text style="font:400 6px Neris Black" fill="#000" x="2" y="18">powered by</text>
+<text style="font:400 16px Neris Thin" fill="#000" x="2" y="34">Oddmuse<tspan style="font-family:Neris Black">.org</tspan></text>
+
+<g id="new" transform="translate(-30,30) scale(.18,.18)" >
+<circle fill="#FFF" stroke="#000" stroke-width="3" cx="0" cy="0" r="160.5"/>
+<g id="new" transform="rotate(207.2)" >
+
+  <path fill="#000" d="m42 -77 q24 0 38 20 c14 -1 42 -18  52 -29 c-1 50 -26 68 -44 70 c0 90 -44 141 -88 141 c-44 0 -88 -51 -88 -141 c-18 -2 -43 -20 -44 -70 c10 11  38 28  52 29 q14 -20 38 -20z"/>
+  <path fill="#000" transform="translate(0,60) rotate(-14)" d="m -22  46q1 50  22  50q21 0  22 -50z"/>
+
+  <path stroke="#FFF" stroke-width="4" fill="#000" d="m0 17 c 30 0  36 -2   46 -2 c 18 0  32 16   32  51 c 0 34 -12 50  -32  50 c-16 0 -26 -5  -46 -5 c-20 0 -30  5  -46  5 c-20 0 -33 -18 -32 -50 c0 -36  16 -52  32 -51 c10  0  16  2   46 2z"/>
+  <circle fill="#FFF" cx="44" cy="49" r="12"/> <circle fill="#FFF" cx="-44" cy="49" r="12"/>
+
+  <circle fill="#FFF" cx="42" cy="-31" r="40"/> <circle fill="#000" cx="42" cy="-31" r="20.5"/>
+  <circle fill="#FFF" cx="-42" cy="-31" r="40"/> <path fill="#000" transform="translate(-42,-31) rotate(55)" d="m-7 7 v20 q7 2 14 0 v-20 h20 q2 -7 0 -14 h-20 v-20 q -7 -2  -14 0 v20 h-20 q-2 7 0 14z"/>
+
+</g></g>
+
+</svg>

logo/falky/oddmuse.icon.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-100 -100 200 200" >
+
+<rect fill="#D88" x="-100" y="-100" width="200" height="200"/>
+
+<g id="new" transform="rotate(180) translate(0,-19)" >
+
+  <path fill="#A00" d="m42 -77 q18 0 33 14 q 12 -6 23 -16 q-2 25 -10 43 c0 110 -44 155 -88 155 c-44 0 -88 -44 -88 -155 q-8 -18 -10 -43 q11 10  23 16 q15 -14 33 -14z"/>
+
+  <path  stroke="#FFF" stroke-width="6" fill="#A00" d="m0 16 c30 0 38 -2  48 -2 c17 0 33 16  33  52 c0 34 -12 52 -31  52 c-15 0 -30 -7 -50 -7 c-20 0 -35 7 -50  7 c-19 0 -31 -18 -31 -52 c0 -36 16 -52 33 -52 c10 0 18 2  48 2z"/>
+  <circle fill="#FFF" cx="45" cy="49" r="12"/> <circle fill="#FFF" cx="-45" cy="49" r="12"/>
+
+  <circle fill="#FFF" cx="42" cy="-31" r="40"/> <circle fill="#000" cx="42" cy="-31" r="20.5"/>
+  <circle fill="#FFF" cx="-42" cy="-31" r="40"/> <path fill="#666" transform="translate(-42,-31) rotate(55)" d="m-7 7 v20 q7 2 14 0 v-20 h20 q2 -7 0 -14 h-20 v-20 q -7 -2  -14 0 v20 h-20 q-2 7 0 14z"/>
+
+</g>
+
+</svg>

logo/falky/oddmuse.logo.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-162 -162 324 324">
+
+<circle fill="#FEE" stroke="#000" stroke-width="3" cx="0" cy="0" r="160.5"/>
+
+<g id="new" transform="rotate(210)" >
+
+  <path fill="#A00" d="m42 -77 q24 0 38 20 c14 -1 42 -18  52 -29 c-1 50 -26 68 -44 70 c0 90 -44 141 -88 141 c-44 0 -88 -51 -88 -141 c-18 -2 -43 -20 -44 -70 c10 11  38 28  52 29 q14 -20 38 -20z"/>
+  <path fill="#A00" transform="translate(0,60) rotate(-14)" d="m -22  46q1 50  22  50q21 0  22 -50z"/>
+
+  <path stroke="#FFF" stroke-width="4" fill="#D88" d="m0 17 c 30 0  36 -2   46 -2 c 18 0  32 16   32  51 c 0 34 -12 50  -32  50 c-16 0 -26 -5  -46 -5 c-20 0 -30  5  -46  5 c-20 0 -33 -18 -32 -50 c0 -36  16 -52  32 -51 c10  0  16  2   46 2z"/>
+  <circle fill="#FFF" cx="44" cy="49" r="12"/> <circle fill="#FFF" cx="-44" cy="49" r="12"/>
+
+  <circle fill="#FFF" cx="42" cy="-31" r="40"/> <circle fill="#000" cx="42" cy="-31" r="20.5"/>
+  <circle fill="#FFF" cx="-42" cy="-31" r="40"/> <path fill="#666" transform="translate(-42,-31) rotate(55)" d="m-7 7 v20 q7 2 14 0 v-20 h20 q2 -7 0 -14 h-20 v-20 q -7 -2  -14 0 v20 h-20 q-2 7 0 14z"/>
+
+</g>
+
+
+
+</svg>

logo/falky/oddmuse.siegel.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-162 -162 324 324">
+
+<circle fill="#FFF" stroke="#000" stroke-width="3" cx="0" cy="0" r="160.5"/>
+
+<text style="font:400 27px Neris Black" fill="#000" text-anchor="middle" x="-5" y="137">Oddmuse</text>
+
+<g id="new" transform="rotate(210)" >
+
+  <path fill="#000" d="m42 -77 q24 0 38 20 c14 -1 42 -18  52 -29 c-1 50 -26 68 -44 70 c0 90 -44 141 -88 141 c-44 0 -88 -51 -88 -141 c-18 -2 -43 -20 -44 -70 c10 11  38 28  52 29 q14 -20 38 -20z"/>
+  <path fill="#000" transform="translate(0,60) rotate(-14)" d="m -22  46q1 50  22  50q21 0  22 -50z"/>
+
+  <path stroke="#FFF" stroke-width="4" fill="#000" d="m0 17 c 30 0  36 -2   46 -2 c 18 0  32 16   32  51 c 0 34 -12 50  -32  50 c-16 0 -26 -5  -46 -5 c-20 0 -30  5  -46  5 c-20 0 -33 -18 -32 -50 c0 -36  16 -52  32 -51 c10  0  16  2   46 2z"/>
+  <circle fill="#FFF" cx="44" cy="49" r="12"/> <circle fill="#FFF" cx="-44" cy="49" r="12"/>
+
+  <circle fill="#FFF" cx="42" cy="-31" r="40"/> <circle fill="#000" cx="42" cy="-31" r="20.5"/>
+  <circle fill="#FFF" cx="-42" cy="-31" r="40"/> <path fill="#000" transform="translate(-42,-31) rotate(55)" d="m-7 7 v20 q7 2 14 0 v-20 h20 q2 -7 0 -14 h-20 v-20 q -7 -2  -14 0 v20 h-20 q-2 7 0 14z"/>
+
+</g>
+
+
+
+</svg>

logo/murray/README.md

@@ -0,0 +1,4 @@
+The logo is licensed under the [GNU Free Documentation
+License](http://www.emacswiki.org/FDL) as well as the [CC BY
+2.0](http://creativecommons.org/licenses/by/2.0/) license. The author
+is [Murray Altheim](http://www.altheim.com/murray/).

logo/murray/oddmuse-logo.svg

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="0.41"
+   sodipodi:docname="oddmuse-logo.svg"
+   sodipodi:docbase="/Users/alex/Pictures/Oddmuse"
+   height="1000pt"
+   width="1000pt"
+   sodipodi:version="0.32"
+   id="svg1">
+  <metadata
+     id="metadata32">
+    <rdf:RDF
+       id="RDF34">
+      <cc:Work
+         id="Work36"
+         rdf:about="">
+        <dc:format
+           id="format38">image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+           id="type40" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     inkscape:current-layer="svg1"
+     inkscape:window-y="22"
+     inkscape:window-x="0"
+     inkscape:window-height="535"
+     inkscape:window-width="640"
+     inkscape:cy="625.00000"
+     inkscape:cx="625.00000"
+     inkscape:zoom="0.28960000"
+     id="base" />
+  <g
+     transform="translate(-155.7935,22.13440)"
+     id="g176">
+    <path
+       transform="matrix(1.021740,0.000000,0.000000,1.021740,-299.4160,85.75640)"
+       sodipodi:ry="148.93437"
+       sodipodi:rx="142.30524"
+       sodipodi:cy="475.27606"
+       sodipodi:cx="1066.8474"
+       d="M 1209.1526 475.27606 A 142.30524 148.93437 0 1 1  924.54218,475.27606 A 142.30524 148.93437 0 1 1  1209.1526 475.27606 z"
+       id="path166"
+       style="fill:#ffde00;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:22.021299;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.591973,0.000000,0.000000,0.523224,159.0800,309.0390)"
+       sodipodi:ry="148.93437"
+       sodipodi:rx="142.30524"
+       sodipodi:cy="475.27606"
+       sodipodi:cx="1066.8474"
+       d="M 1209.1526 475.27606 A 142.30524 148.93437 0 1 1  924.54218,475.27606 A 142.30524 148.93437 0 1 1  1209.1526 475.27606 z"
+       id="path168"
+       style="fill:#ffde00;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:38.609402;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+       sodipodi:type="arc" />
+    <rect
+       transform="translate(-1.416020,0.000000)"
+       y="561.16870"
+       x="694.39026"
+       height="88.691116"
+       width="195.30150"
+       id="rect170"
+       style="font-size:12.000000;fill:#ffde00;fill-opacity:1.0000000;fill-rule:evenodd;stroke-width:1.0000000pt" />
+    <g
+       id="g173">
+      <path
+         transform="translate(185.0000,-158.7500)"
+         sodipodi:ry="31.250000"
+         sodipodi:rx="25.000000"
+         sodipodi:cy="783.75000"
+         sodipodi:cx="565.00000"
+         d="M 590.00000 783.75000 A 25.000000 31.250000 0 1 1  540.00000,783.75000 A 25.000000 31.250000 0 1 1  590.00000 783.75000 z"
+         id="path171"
+         style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(266.2500,-158.7500)"
+         sodipodi:ry="31.250000"
+         sodipodi:rx="25.000000"
+         sodipodi:cy="783.75000"
+         sodipodi:cx="565.00000"
+         d="M 590.00000 783.75000 A 25.000000 31.250000 0 1 1  540.00000,783.75000 A 25.000000 31.250000 0 1 1  590.00000 783.75000 z"
+         id="path172"
+         style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>

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;
 

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,10 +11,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 strict;
 use v5.10;

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,10 +11,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 strict;
 use v5.10;

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,10 +11,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 strict;
 use v5.10;

modules/agree-disagree.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,10 +11,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 strict;
 use v5.10;

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,10 +11,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 strict;
 use v5.10;

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,10 +11,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 strict;
 use v5.10;

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,10 +11,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 strict;
 use v5.10;

modules/autolock.pl

@@ -206,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,10 +11,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/>.
 
 # 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

modules/ban-contributors.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Alex Schroeder <alex@gnu.org>
+# 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
@@ -21,11 +21,12 @@ 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 or hostname will be added to the C<BannedHosts> page for you.
+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');
@@ -56,17 +57,18 @@ sub IsItBanned {
 sub DoBanHosts {
   my $id = shift;
   my $content = GetParam('content', '');
-  my $host = GetParam('host', '');
+  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 ($host) {
-    $host =~ s/\./\\./g;
+  } elsif ($regexp) {
     SetParam('text', GetPageContent($BannedHosts)
-	     . "^" . $host . " # " . CalcDay($Now) . " "
+	     . $regexp . " # " . CalcDay($Now)
+	     . " $range "
 	     . NormalToFree($id) . "\n");
     SetParam('summary', NormalToFree($id));
     DoPost($BannedHosts);
@@ -94,10 +96,14 @@ sub DoBanHosts {
       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('host', $_),
+	  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();
       }
@@ -158,3 +164,95 @@ sub NewBanContributorsWriteRcLog {
   };
   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-mixed-scripts.pl

@@ -0,0 +1,72 @@
+# Copyright (C) 2018  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/>.
+
+=encoding utf8
+
+=head1 Mixed Scripts
+
+This module disallows ordinary users from posting words that consist of multiple
+scripts. Stuff like this: "It's diffіcult to find knowledgeable people on this
+topic, but youu sound like you know wgat you're taⅼkіng аboսt!" Did you notice
+the confusable characters? The sentence contains the following:
+ARMENIAN SMALL LETTER SEH
+CYRILLIC SMALL LETTER A
+CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+SMALL ROMAN NUMERAL FIFTY
+
+=cut
+
+use strict;
+use v5.10;
+
+use Unicode::UCD qw(charprop);
+
+AddModuleDescription('ban-mixed-scripts.pl', 'Ban Mixed Scripts Extension');
+
+*OldBanMixedScriptsBannedContent = \&BannedContent;
+*BannedContent = \&NewBanMixedScriptsBannedContent;
+
+sub NewBanMixedScriptsBannedContent {
+  my $rule = OldBanMixedScriptsBannedContent(@_);
+  $rule ||= BanMixedScript(@_);
+  return $rule;
+}
+
+sub BanMixedScript {
+  my $str = shift;
+  my @words = $str =~ m/\w+/g;
+  my %seen;
+  my %prop;
+  for my $word (@words) {
+    next if $seen{$word};
+    $seen{$word} = 1;
+    my $script;
+    for my $char (split(//, $word)) {
+      my $s = $prop{$char};
+      if (not $s) {
+	$s = charprop(ord($char), "Script_Extensions");
+	if ($s eq 'Hiragana') {
+	  $s = 'Han'; # this mixing is ok
+	}
+	$prop{$char} = $s;
+      }
+      next if $s eq "Common";
+      if (not $script) {
+	$script = $s;
+      } elsif ($script ne $s) {
+	return "Mixed scripts in $word ($script and $s, if not more)";
+      }
+    }
+  }
+}

modules/banned-regexps.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2012-2018  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
@@ -45,7 +45,8 @@ This extension works with logbannedcontent.pl.
 
 =cut
 
-our (%AdminPages, %LockOnCreation, @MyInitVariables, %PlainTextPages, $BannedContent, $BannedFile);
+our (%AdminPages, %LockOnCreation, @MyInitVariables, %PlainTextPages, $BannedContent, $BannedFile,
+    $FullUrlPattern);
 our ($BannedRegexps);
 
 $BannedRegexps = 'BannedRegexps';
@@ -61,7 +62,10 @@ push(@MyInitVariables, sub {
 
 sub RegexpNewBannedContent {
   my $str = shift;
+  # check whether Banned Content complains
   my $rule = RegexpOldBannedContent($str, @_);
+  # remove URLs as they have been checked by $BannedContent
+  $str =~ s/$FullUrlPattern//g;
   if (not $rule) {
     foreach (split(/\n/, GetPageContent($BannedRegexps))) {
       next unless m/^\s*([^#]+?)\s*(#\s*(\d\d\d\d-\d\d-\d\d\s*)?(.*))?$/;

modules/bbcode.pl

@@ -19,7 +19,7 @@ AddModuleDescription('bbcode.pl', 'bbCode Extension');
 
 our ($q, @HtmlStack, @MyRules, %RuleOrder, $UrlProtocols, $FullUrlPattern);
 push(@MyRules, \&bbCodeRule);
-$RuleOrder{\&bbCodeRule} = 100; # must come after PortraitSupportRule
+$RuleOrder{\&bbCodeRule} = 300; # must come after PortraitSupportRule, MarkdownRule
 
 our ($bbBlock);
 my %bbTitle = qw(h1 1 h2 1 h3 1 h4 1 h5 1 h6 1);

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,10 +11,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 strict;
 use v5.10;

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,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 strict;
 use v5.10;
@@ -26,6 +23,7 @@ our ($q, %Page, %Action, $Now, $OpenPageName, $CollectingJournal, $FreeLinkPatte
 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
 
@@ -37,8 +35,22 @@ sub NewCalendarGetHeader {
   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;
 }
 
@@ -88,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;
@@ -129,7 +141,7 @@ sub CalendarRule {
     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?))/cg
@@ -144,7 +156,7 @@ 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');
   }

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,10 +11,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 strict;
 use v5.10;

modules/cart.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,10 +11,8 @@
 # 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 strict;
 use v5.10;
 use utf8;

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,10 +11,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 strict;
 use v5.10;

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,10 +11,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 strict;
 use v5.10;

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,10 +11,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 strict;
 use v5.10;

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,10 +11,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 strict;
 use v5.10;

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,

modules/creationdate.pl

@@ -1,34 +1,35 @@
 # Copyright (C) 2005  Fletcher T. Penney <fletcher@freeshell.org>
+# Copyright (C) 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 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
-#
-# This module stores additional information about a page when it is
-# first created:
-#		created = the date the page is FIRST saved
-#		originalAuthor = the username that first created a page
-#
-# Of course, you can customize this to store more information
+# 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 Creation Date Extension
+
+This module stores additional information about a page when it is first created:
+
+=over
+=item C<created> is the date the page is first saved
+=item C<originalAuthor> is the username that first created a page
+=back
+=cut
 
 use strict;
 use v5.10;
 
 AddModuleDescription('creationdate.pl', 'CreationDate Module');
 
-our (%Page, $Now);
+our (%Page, $Now, @MyAdminCode, %Action, $q, $FS, $RcOldFile, $RcFile);
 
 *CreationDateOldOpenPage = \&OpenPage;
 *OpenPage = \&CreationDateOpenPage;
@@ -39,3 +40,45 @@ sub CreationDateOpenPage{
 	$Page{originalAuthor} = GetParam('username','') unless $Page{originalAuthor}
 		or $Page{revision};
 }
+
+# Allow administrators to add the 'created' item to page files, based on rc log
+# files.
+
+push(@MyAdminCode, \&CreationDateMenu);
+
+sub CreationDateMenu {
+  my ($id, $menuref, $restref) = @_;
+  push(@$menuref,
+       ScriptLink('action=add-creation-date',
+		  T('Add creation date to page files'),
+		  'creationdate')) if UserIsAdmin();
+}
+
+$Action{'add-creation-date'} = \&AddCreationDate;
+
+sub AddCreationDate {
+  print GetHeader('', T('Add creation date to page files'));
+  print $q->start_div({-class=>'creationdate'});
+  print '<ul>';
+  RequestLockOrError();
+  for my $file ($RcOldFile, $RcFile) {
+    open(my $F, '<:encoding(UTF-8)', encode_utf8($file)) or next;
+    while (my $line = <$F>) {
+      chomp($line);
+      my ($ts, $id, $minor, $summary, $host, $username, $revision)
+	  = split(/$FS/, $line);
+      next unless $revision == 1;
+      print $q->li(NormalToFree($id));
+      OpenPage($id);
+      next unless $Page{revision}; # skip if page no longer exists
+      next if $Page{created} and $Page{originalAuthor};
+      $Page{created} = $ts unless $Page{created};
+      $Page{originalAuthor} = $username unless $Page{originalAuthor};
+      SavePage();
+    }
+  }
+  ReleaseLock();
+  print '</ul>';
+  print $q->end_div();
+  PrintFooter();
+}

modules/creole.pl

@@ -405,8 +405,7 @@ sub CreoleRule {
          if ($is_left_justified and
              $is_right_justified) { $attributes .= 'align="center"' }
       elsif ($is_right_justified) { $attributes .= 'align="right"' }
-      # this is the default:
-      # elsif ($is_left_justified) { $attributes .= 'align="left"' }
+      elsif ($is_left_justified) { $attributes .= 'align="left"' }
 
       return
          (InElement('td') || InElement('th') ? CloseHtmlEnvironmentUntil('tr') : '')

modules/crumbs.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,10 +11,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 strict;
 use v5.10;

modules/csv.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,10 +11,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 strict;
 use v5.10;

modules/despam.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,10 +11,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 strict;
 use v5.10;

modules/ditaa.pl

@@ -0,0 +1,49 @@
+#! /usr/bin/perl
+# Copyright (C) 2015–2017  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('ditaa.pl', 'Ditaa for Diagrams');
+
+our ($q, $bol, @MyRules, @KnownLocks, $TempDir);
+
+push (@MyRules, \&DitaaRule);
+push(@KnownLocks, 'diagram');
+
+sub DitaaRule {
+  if ($bol && m/\G&lt;diagram(\s+style=".*")?&gt;\n((.*\n)+)&lt;\/diagram&gt;/cg) {
+    return "MIME::Base64 not installed" unless eval { require MIME::Base64; };
+    my $style = $1;
+    my $map = UnquoteHtml($2);
+    RequestLockDir('diagram', undef, undef, 1);
+    WriteStringToFile("$TempDir/diagram.txt", $map);
+    $ENV{LANG}='en_US.UTF-8'; # Java needs Locale to match as well!
+    my $output = `ditaa "$TempDir/diagram.txt" "$TempDir/diagram.png"`;
+    my $image = '';
+    # not UTF-8 layer!
+    if (open(IN, '<', "$TempDir/diagram.png")) {
+      local $/ = undef; # Read complete files
+      $image = <IN>;
+      close IN;
+    }
+    ReleaseLockDir('diagram');
+    my $data = MIME::Base64::encode_base64($image);
+    my $url = "data:image/png;base64,$data";
+    return CloseHtmlEnvironments()
+      . "<div$style>" . $q->img({-src=>$url, -alt=>$map}) . "</div>";
+  }
+  return undef;
+}

modules/doubleclick.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/>.
 
 # This module offers the user the additional possibility to
 # edit a page by double-clicking on it. The user must have

modules/download.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,10 +11,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 strict;
 use v5.10;

modules/dynlogo.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,10 +11,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/>.
 
 # Makes the wiki logo depend on the current date.
 #

modules/edit-assist.pl

@@ -1,6 +1,6 @@
 # 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,
@@ -9,10 +9,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 strict;
 use v5.10;

modules/faq.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/>.
 
 # This module creates a list of all questions on the page, e.g.
 # for a faq. It does so by recognizing all lines that begin with

modules/fckeditor.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,10 +11,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 strict;
 use v5.10;

modules/flickrgallery.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,10 +11,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 strict;
 use v5.10;

modules/git.pl

@@ -196,7 +196,7 @@ sub GitCleanup {
       my $name = decode_utf8($file);
       next if $file eq '.git' or $file eq '.' or $file eq '..' or $IndexHash{$name};
       print $q->p("Deleting left over file $name");
-      Unlink("$GitRepo/$file") or ReportError("cannot delete $GitRepo/$name: $!");
+      Unlink("$GitRepo/$file") or print $q->p("Cannot delete $GitRepo/$name: $!");
     }
     closedir DIR;
     # write all the files again, just to be sure

modules/google-search.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,10 +11,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 strict;
 use v5.10;

modules/gotobar.pl

@@ -1,4 +1,5 @@
 # Copyright (C) 2006-2014  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2016  Ingo Belka
 #
 # 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
@@ -25,6 +26,9 @@ our ($GotobarName);
 
 $GotobarName = 'GotoBar';
 
+our ($GotobarSetHome, $GotobarSetRC);
+# 0 does set home-link and/or rc-link automatically, 1 doesn't
+
 # do this later so that the user can customize $GotobarName
 push(@MyInitVariables, \&GotobarInit);
 
@@ -53,10 +57,10 @@ sub GotobarInit {
 	# is the list of recent changes.
 	$count++;
 	if ($count == 1) {
-	  $HomePage = FreeToNormal($page);
-	} elsif ($count == 2) {
-	  $RCName = FreeToNormal($page);
-	}
+        unless ($GotobarSetHome) {$HomePage = FreeToNormal($page)};
+    } elsif ($count == 2) {
+        unless ($GotobarSetRC) {$RCName = FreeToNormal($page);}
+    }
       }
     }
   }

modules/grep.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,10 +11,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 strict;
 use v5.10;

modules/header-and-footer-templates.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,10 +11,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 strict;
 use v5.10;

modules/headers.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,10 +11,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 strict;
 use v5.10;

modules/headlines.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 strict;
 use v5.10;

modules/hiddenpages.pl

@@ -5,7 +5,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,
@@ -14,10 +14,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/>.
 
 # This module offers the possibility to restrict viewing of "hidden"
 # pages to only editors or admins. The restriction may be based

modules/html-template.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,10 +11,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 strict;
 use v5.10;

modules/html-uploads.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,10 +11,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 strict;
 use v5.10;

modules/htmllinks.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,10 +11,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 strict;
 use v5.10;

modules/image.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,10 +11,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 strict;
 use v5.10;

modules/index.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,10 +11,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 strict;
 use v5.10;

modules/irc.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,10 +11,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 strict;
 use v5.10;

modules/journal-rss.pl

@@ -1,4 +1,4 @@
-# Copyright (C) 2004–2014  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2004–2018  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
@@ -30,15 +30,43 @@ sub DoJournalRss {
   local $CollectingJournal = 1;
   # Fake the result of GetRcLines()
   local *GetRcLines = \&JournalRssGetRcLines;
+  local *RcSelfAction = \&JournalRssSelfAction;
+  local *RcPreviousAction = \&JournalRssPreviousAction;
+  local *RcLastAction = \&JournalRssLastAction;
+  SetParam('full', 1);
   print GetHttpHeader('application/xml') . GetRcRss();
 }
 
+sub JournalRssParameters {
+  my $more = '';
+  foreach (@_, qw(rsslimit match search reverse monthly)) {
+    my $val = GetParam($_, '');
+    $more .= ";$_=$val" if $val;
+  }
+  return $more;
+}
+
+sub JournalRssSelfAction {
+  return "action=journal" . JournalRssParameters(qw(offset));
+}
+
+sub JournalRssPreviousAction {
+  my $num = GetParam('rsslimit', 10);
+  my $offset = GetParam('offset', 0) + $num;
+  return "action=journal;offset=$offset" . JournalRssParameters();
+}
+
+sub JournalRssLastAction {
+  return "action=journal" . JournalRssParameters();
+}
+
 sub JournalRssGetRcLines {
   my $num = GetParam('rsslimit', 10);
   my $match = GetParam('match', '^\d\d\d\d-\d\d-\d\d');
   my $search = GetParam('search', '');
   my $reverse = GetParam('reverse', 0);
   my $monthly = GetParam('monthly', 0);
+  my $offset = GetParam('offset', 0);
   my @pages = sort JournalSort (grep(/$match/, $search ? SearchTitleAndBody($search) : AllPagesList()));
   if ($monthly and not $match) {
     my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime();
@@ -48,28 +76,19 @@ sub JournalRssGetRcLines {
     @pages = reverse @pages;
   }
   # FIXME: Missing 'future' and 'past' keywords.
-  # FIXME: Do we need 'offset'? I don't think so.
   my @result = ();
+  my $n = 0;
   foreach my $id (@pages) {
     # Now save information required for saving the cache of the current page.
     local %Page;
     local $OpenPageName = '';
     OpenPage($id);
-    # If this is a minor edit, ignore it. Load the last major revision
-    # instead, if you can.
-    if ($Page{minor}) {
-      # Perhaps the old kept revision is gone due to $KeepMajor=0 or
-      # admin.pl or because a page was created as a minor change and
-      # never edited. Reading kept revisions in this case results in
-      # an error.
-      eval {
- 	%Page = GetKeptRevision($Page{lastmajor});
-      };
-      next if $@;
-    }
     next if $Page{text} =~ /^\s*$/; # only whitespace is also to be deleted
     next if $DeletedPage && substr($Page{text}, 0, length($DeletedPage))
-      eq $DeletedPage; # no regexp
+	eq $DeletedPage; # no regexp
+    # OK, this is a candidate page
+    $n++;
+    next if $n <= $offset;
     # Generate artifical rows in the list to pass to GetRcRss. We need
     # to open every single page, because the meta-data ordinarily
     # available in the rc.log file is not available to us. This is why
@@ -79,7 +98,7 @@ sub JournalRssGetRcLines {
     push (@result, [$Page{ts}, $id, $Page{minor}, $Page{summary}, $Page{host},
 		    $Page{username}, $Page{revision}, \@languages,
 		    GetCluster($Page{text})]);
-    last if $num ne 'all' and $#result + 1 >= $num;
+    last if @result >= $num;
   }
   return @result;
 }

modules/lang.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,10 +11,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/>.
 
 # In your CSS file, use something like this, for example:
 

modules/latex.pl

@@ -198,8 +198,7 @@ sub MakeLaTeX {
       }
 
       if (not $error and IsFile('srender1.png') and not ZeroSize('srender1.png')) {
-	my $png = ReadFileOrDie("srender1.png");
-	WriteStringToFile ("$LatexDir/$hash.png", $png);
+	Rename("srender1.png", "$LatexDir/$hash.png");
       } else {
 	$error = "[Error retrieving image for $latex]";
       }

modules/linebreaks.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,10 +11,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 strict;
 use v5.10;

modules/links.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,10 +11,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 strict;
 use v5.10;

modules/linktagmap.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,13 +11,8 @@
 # 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
-#
-# Based on code of tagmap.pl module by Fletcher T. Penney
-# and searchtags.pl module by Brock Wilcox
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 use strict;
 use v5.10;
 

modules/listtags.pl

@@ -2,7 +2,7 @@
 # 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 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,10 +11,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 strict;
 use v5.10;

modules/live-templates.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,10 +11,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 strict;
 use v5.10;

modules/login.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,10 +11,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 strict;
 use v5.10;

modules/logout.pl

@@ -266,18 +266,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/markdown-rule.pl

@@ -1,5 +1,5 @@
 #! /usr/bin/perl
-# Copyright (C) 2014  Alex Schroeder <alex@gnu.org>
+# Copyright (C) 2014–2017  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
@@ -18,7 +18,7 @@ use v5.10;
 
 AddModuleDescription('markdown-rule.pl', 'Markdown Rule Extension');
 
-our ($q, $bol, %RuleOrder, @MyRules, $UrlProtocols, $FullUrlPattern);
+our ($q, $bol, %RuleOrder, @MyRules, $UrlProtocols, $FullUrlPattern, @HtmlStack);
 
 push(@MyRules, \&MarkdownRule);
 # Since we want this package to be a simple add-on, we try and avoid
@@ -31,58 +31,94 @@ $RuleOrder{\&MarkdownRule} = 200;
 # https://help.github.com/articles/github-flavored-markdown
 
 sub MarkdownRule {
+  # \escape
+  if (m/\G\\([-#>*`=])/cg) {
+    return $1;
+  }
   # atx headers
-  if ($bol and m~\G(\s*\n)*(#{1,6})[ \t]*~cg) {
+  elsif ($bol and m~\G(\s*\n)*(#{1,6})[ \t]*~cg) {
     my $header_depth = length($2);
     return CloseHtmlEnvironments()
       . AddHtmlEnvironment("h" . $header_depth);
   }
   # end atx header at a newline
   elsif ((InElement('h1') or InElement('h2') or InElement('h3') or
-	  InElement('h4') or InElement('h5') or InElement('h6'))
-	 and m/\G\n/cg) {
+  	  InElement('h4') or InElement('h5') or InElement('h6'))
+  	 and m/\G\n/cg) {
     return CloseHtmlEnvironments()
       . AddHtmlEnvironment("p");
   }
-  # setext headers
-  elsif ($bol and m/\G((\s*\n)*(.+?)[ \t]*\n(-+|=+)[ \t]*\n)/cg) {
-    return CloseHtmlEnvironments()
-      . (substr($4,0,1) eq '=' ? $q->h2($3) : $q->h3($3))
-      . AddHtmlEnvironment('p');
-  }
   # > blockquote
   # with continuation
   elsif ($bol and m/\G&gt;/cg) {
     return CloseHtmlEnvironments()
       . AddHtmlEnvironment('blockquote');
   }
+  # ``` = code
+  elsif ($bol and m/\G```[ \t]*\n(.*?)\n```[ \t]*(\n|$)/cgs) {
+    return CloseHtmlEnvironments() . $q->pre($1)
+      . AddHtmlEnvironment("p");
+  }
+  # ` = code may not start with a newline
+  elsif (m/\G`([^\n`][^`]*)`/cg) {
+    return $q->code($1);
+  }
   # ***bold and italic***
   elsif (not InElement('strong') and not InElement('em') and m/\G\*\*\*/cg) {
     return AddHtmlEnvironment('em') . AddHtmlEnvironment('strong');
   }
+  elsif (InElement('strong') and InElement('em') and m/\G\*\*\*/cg) {
+    return CloseHtmlEnvironment('strong') . CloseHtmlEnvironment('em');
+  }
   # **bold**
   elsif (m/\G\*\*/cg) {
     return AddOrCloseHtmlEnvironment('strong');
   }
-  # *italic*
-  elsif (m/\G\*/cg) {
-    return AddOrCloseHtmlEnvironment('em');
+  # *italic* (closing before adding environment!)
+  elsif (InElement('em') and m/\G\*/cg) {
+    return CloseHtmlEnvironment('em');
+  }
+  elsif ($bol and m/\G\*/cg or m/\G(?<=\P{Word})\*/cg) {
+    return AddHtmlEnvironment('em');
   }
   # ~~strikethrough~~ (deleted)
   elsif (m/\G~~/cg) {
     return AddOrCloseHtmlEnvironment('del');
   }
-  # - bullet list
-  elsif ($bol and m/\G(\s*\n)*-[ \t]*/cg
-	   or InElement('li') and m/\G(\s*\n)+-[ \t]*/cg) {
-    return CloseHtmlEnvironment('li')
-      . OpenHtmlEnvironment('ul',1) . AddHtmlEnvironment('li');
-  }
-  # 1. numbered list
-  elsif ($bol and m/\G(\s*\n)*\d+\.[ \t]*/cg
-	   or InElement('li') and m/\G(\s*\n)+\d+\.[ \t]*/cg) {
-    return CloseHtmlEnvironment('li')
-      . OpenHtmlEnvironment('ol',1) . AddHtmlEnvironment('li');
+  # indented lists = nested lists
+  elsif ($bol and m/\G(\s*\n)*()([*-]|\d+\.)[ \t]+/cg
+      or InElement('li') && m/\G(\s*\n)+( *)([*-]|\d+\.)[ \t]+/cg) {
+    my $nesting_goal = int(length($2)/4) + 1;
+    my $tag = ($3 eq '*' or $3 eq '-') ? 'ul' : 'ol';
+    my $nesting_current = 0;
+    my @nesting = grep(/^[uo]l$/, @HtmlStack);
+    my $html = CloseHtmlEnvironmentUntil('li'); # but don't close li element
+    # warn "\@nesting is (@nesting)\n";
+    # warn "    goal is $nesting_goal\n";
+    # warn "     tag is $3 > $tag\n";
+    while (@nesting > $nesting_goal) {
+      $html .= CloseHtmlEnvironment(pop(@nesting));
+      # warn "      pop\n";
+    }
+    # if have the correct nesting level, but the wrong type, close it
+    if (@nesting == $nesting_goal
+	and $nesting[$#nesting] ne $tag) {
+      $html .= CloseHtmlEnvironment(pop(@nesting));
+      # warn "   switch\n";
+    }
+    # now add a list of the appropriate type
+    if (@nesting < $nesting_goal) {
+      $html .= AddHtmlEnvironment($tag);
+      # warn "       add $tag\n";
+    }
+    # and a new list item
+    if (InElement('li')) {
+      $html .= CloseHtmlEnvironmentUntil($nesting[$#nesting]);
+      # warn "     close li\n";
+    }
+    $html .= AddHtmlEnvironment('li');
+      # warn "       add li\n";
+    return $html;
   }
   # beginning of a table
   elsif ($bol and !InElement('table') and m/\G\|/cg) {
@@ -124,11 +160,6 @@ sub MarkdownRule {
     }
     return OpenHtmlEnvironment('pre',1) . $str; # always level 1
   }
-  # ``` = code
-  elsif ($bol and m/\G```[ \t]*\n(.*?)\n```[ \t]*(\n|$)/cgs) {
-    return CloseHtmlEnvironments() . $q->pre($1)
-      . AddHtmlEnvironment("p");
-  }
   # [an example](http://example.com/ "Title")
   elsif (m/\G\[(.+?)\]\($FullUrlPattern(\s+"(.+?)")?\)/cg) {
     my ($text, $url, $title) = ($1, $2, $4);
@@ -139,5 +170,39 @@ sub MarkdownRule {
     $params{-title} = $title if $title;
     return $q->a(\%params, $text);
   }
+  # setext headers (must come after block quotes)
+  elsif ($bol and m/\G((\s*\n)*(.+?)[ \t]*\n(-+|=+)[ \t]*\n)/cg) {
+    return CloseHtmlEnvironments()
+      . (substr($4,0,1) eq '=' ? $q->h2($3) : $q->h3($3))
+      . AddHtmlEnvironment('p');
+  }
+  return;
+}
+
+push(@MyRules, \&MarkdownExtraRule);
+
+sub MarkdownExtraRule {
+  # __italic underline__
+  if (m/\G__/cg) {
+    return AddOrCloseHtmlEnvironment('em', 'style="font-style: normal; text-decoration: underline"');
+  }
+  # _underline_ (closing before adding environment!)
+  elsif (InElement('em', 'style="font-style: normal; text-decoration: underline"') and m/\G_/cg) {
+    return CloseHtmlEnvironment('em');
+  }
+  elsif ($bol and m/\G_/cg or m/\G(?<=\P{Word})_(?=\S)/cg) {
+    return AddHtmlEnvironment('em', 'style="font-style: normal; text-decoration: underline"');
+  }
+  # //italic//
+  elsif (m/\G\/\//cg) {
+    return AddOrCloseHtmlEnvironment('em');
+  }
+  # /italic/ (closing before adding environment!)
+  elsif (InElement('em') and m/\G\//cg) {
+    return CloseHtmlEnvironment('em');
+  }
+  elsif ($bol and m/\G\//cg or m/\G(?<=[|[:space:]])\/(?=\S)/cg) {
+    return AddHtmlEnvironment('em');
+  }
   return;
 }

modules/mermaid.pl

@@ -0,0 +1,73 @@
+#! /usr/bin/perl
+# Copyright (C) 2017  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('mermaid.pl', 'Mermaid for Diagrams');
+
+our ($bol, @MyRules, $MermaidCss, $MermaidJs, $HtmlHeaders, %Page);
+
+$MermaidCss = '/mermaid/mermaid.css';
+$MermaidJs = '/mermaid/mermaid.min.js';
+
+# When browsing a page containing mermaid markup, load the mermaid Javascript and CSS
+
+*MermaidOldBrowsePage = *BrowsePage;
+*BrowsePage = *MermaidNewBrowsePage;
+
+sub MermaidNewBrowsePage {
+  my ($id) = @_;
+  OpenPage($id);
+  # Uses <mermaid> to render graphs
+  if ($Page{text} =~ /<mermaid>/
+      and $HtmlHeaders !~ /mermaid/) {
+    $HtmlHeaders .= qq{
+<link type="text/css" rel="stylesheet" href="$MermaidCss" />
+<script type="text/javascript" src="$MermaidJs"></script>
+};
+  }
+  return MermaidOldBrowsePage(@_);
+}
+
+# When previewing an edit containing mermaid markup, load the mermaid Javascript
+# and CSS
+
+*MermaidOldDoEdit = *DoEdit;
+*DoEdit = *MermaidNewDoEdit;
+
+sub MermaidNewDoEdit {
+  # Uses <mermaid> to render graphs
+  if (GetParam('text') =~ /&lt;mermaid&gt;/
+      and $HtmlHeaders !~ /mermaid/) {
+    $HtmlHeaders = q{
+<link rel="stylesheet" href="/mermaid/mermaid.css" />
+<script type="text/javascript" src="/mermaid/mermaid.min.js"></script>
+};
+  }
+  return MermaidOldDoEdit(@_);
+}
+
+# And a formatting rule, of course.
+
+push(@MyRules, \&MermaidRule);
+
+sub MermaidRule {
+  if ($bol && m/\G\&lt;mermaid\&gt;\n(.+?)\n\&lt;\/mermaid\&gt;/cgs) {
+    return CloseHtmlEnvironments()
+        . '<div class="mermaid">' . UrlDecode($1) . '</div>';
+  }
+  return undef;
+}

modules/moin.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,10 +11,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 strict;
 use v5.10;

modules/namespaces.pl

@@ -80,6 +80,21 @@ $NamespaceSlashing = 0;   # affects : decoding NamespaceRcLines
 # variables (eg. localnames.pl)
 unshift(@MyInitVariables, \&NamespacesInitVariables);
 
+sub GetNamespace {
+  my $ns = GetParam('ns', '');
+  if (not $ns and $UsePathInfo) {
+    my $path_info = decode_utf8($q->path_info());
+    # make sure ordinary page names are not matched!
+    if ($path_info =~ m|^/($InterSitePattern)(/.*)?|
+	and ($2 or $q->keywords or NamespaceRequiredByParameter())) {
+      $ns = $1;
+    }
+  }
+  ReportError(Ts('%s is not a legal name for a namespace', $ns))
+    if $ns and $ns !~ m/^($InterSitePattern)$/;
+  return $ns;
+}
+
 sub NamespacesInitVariables {
   %Namespaces = ();
   # Do this before changing the $DataDir and $ScriptName
@@ -96,17 +111,7 @@ sub NamespacesInitVariables {
   }
   $NamespaceRoot = $ScriptName; # $ScriptName may be changed below
   $NamespaceCurrent = '';
-  my $ns = GetParam('ns', '');
-  if (not $ns and $UsePathInfo) {
-    my $path_info = decode_utf8($q->path_info());
-    # make sure ordinary page names are not matched!
-    if ($path_info =~ m|^/($InterSitePattern)(/.*)?|
-	and ($2 or $q->keywords or NamespaceRequiredByParameter())) {
-      $ns = $1;
-    }
-  }
-  ReportError(Ts('%s is not a legal name for a namespace', $ns))
-    if $ns and $ns !~ m/^($InterSitePattern)$/;
+  my $ns = GetNamespace();
   if ($ns
       and $ns ne $NamespacesMain
       and $ns ne $NamespacesSelf) {
@@ -400,7 +405,7 @@ $Action{namespaces} = \&DoNamespacesList;
 sub DoNamespacesList {
   if (GetParam('raw', 0)) {
     print GetHttpHeader('text/plain');
-    print join("\n", keys %Namespaces), "\n";
+    print join("\n", sort keys %Namespaces), "\n";
   } else {
     print GetHeader('', T('Namespaces')),
       $q->start_div({-class=>'content namespaces'}),
@@ -408,7 +413,7 @@ sub DoNamespacesList {
 	  GetHiddenValue('id', $HomePage);
     my $new = $q->textfield('ns') . ' ' . $q->submit('donamespace', T('Go!'));
     print $q->ul($q->li([map { $q->a({-href => $Namespaces{$_} . $HomePage},
-				     $_); } keys %Namespaces]), $q->li($new));
+				     $_); } sort keys %Namespaces]), $q->li($new));
     print $q->end_form() . $q->end_div();
     PrintFooter();
   }