Merge remote branch 'smcv/unescaped-meta'

Conflicts:
	IkiWiki/Plugin/meta.pm

diff --combined IkiWiki/Plugin/meta.pm
index 892f6b2c96a46e93e610a1690d5f19ffa50b7703,9906c3f5713cc567ece9ba8b93e96fcf5f18f831..128a6342c74a4ad13adb2f0521d85ddfb29232bb
--- 1/IkiWiki/Plugin/meta.pm
--- 2/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@@ -88,26 -88,15 +88,21 @@@ sub preprocess (@) 
  
        # Metadata collection that needs to happen during the scan pass.
        if ($key eq 'title') {
-               my $encoded = HTML::Entities::encode_numeric($value);
-               $pagestate{$page}{meta}{title} = $encoded;
- 
+               $pagestate{$page}{meta}{title}=$value;
 +              if (exists $params{sortas}) {
 +                      $pagestate{$page}{meta}{titlesort}=$params{sortas};
 +              }
-               elsif ($encoded ne $value) {
-                       $pagestate{$page}{meta}{titlesort}=$value;
-               }
 +              else {
 +                      delete $pagestate{$page}{meta}{titlesort};
 +              }
                return "";
        }
        elsif ($key eq 'description') {
-               $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
+               $pagestate{$page}{meta}{description}=$value;
                # fallthrough
        }
        elsif ($key eq 'guid') {
-               $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
+               $pagestate{$page}{meta}{guid}=$value;
                # fallthrough
        }
        elsif ($key eq 'license') {
@@@ -127,12 -116,6 +122,12 @@@
        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;
 +              if (exists $params{sortas}) {
 +                      $pagestate{$page}{meta}{authorsort}=$params{sortas};
 +              }
 +              else {
 +                      delete $pagestate{$page}{meta}{authorsort};
 +              }
                # fallthorough
        }
        elsif ($key eq 'authorurl') {
@@@ -281,15 -264,20 +276,20 @@@ sub pagetemplate (@) 
                $template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}}));
        }
        if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
-               $template->param(title => $pagestate{$page}{meta}{title});
+               $template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));
                $template->param(title_overridden => 1);
        }
  
-       foreach my $field (qw{author authorurl description permalink}) {
+       foreach my $field (qw{author authorurl permalink}) {
                $template->param($field => $pagestate{$page}{meta}{$field})
                        if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
        }
  
+       foreach my $field (qw{description}) {
+               $template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
+                       if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
+       }
+ 
        foreach my $field (qw{license copyright}) {
                if (exists $pagestate{$page}{meta}{$field} && $template->query(name => $field) &&
                    ($page eq $destpage || ! exists $pagestate{$destpage}{meta}{$field} ||
@@@ -299,33 -287,6 +299,33 @@@
        }
  }
  
 +sub get_sort_key {
 +      my $page = shift;
 +      my $meta = shift;
 +
 +      # e.g. titlesort (also makes sense for author)
 +      my $key = $pagestate{$page}{meta}{$meta . "sort"};
 +      return $key if defined $key;
 +
 +      # e.g. title
 +      $key = $pagestate{$page}{meta}{$meta};
 +      return $key if defined $key;
 +
 +      # fall back to closer-to-core things
 +      if ($meta eq 'title') {
 +              return pagetitle(IkiWiki::basename($page));
 +      }
 +      elsif ($meta eq 'date') {
 +              return $IkiWiki::pagectime{$page};
 +      }
 +      elsif ($meta eq 'updated') {
 +              return $IkiWiki::pagemtime{$page};
 +      }
 +      else {
 +              return '';
 +      }
 +}
 +
  sub match {
        my $field=shift;
        my $page=shift;
@@@ -376,27 -337,4 +376,27 @@@ sub match_copyright ($$;@) 
        IkiWiki::Plugin::meta::match("copyright", @_);
  }
  
 +package IkiWiki::SortSpec;
 +
 +sub cmp_meta {
 +      my $meta = shift;
 +      error(gettext("sort=meta requires a parameter")) unless defined $meta;
 +
 +      if ($meta eq 'updated' || $meta eq 'date') {
 +              return IkiWiki::Plugin::meta::get_sort_key($a, $meta)
 +                      <=>
 +                      IkiWiki::Plugin::meta::get_sort_key($b, $meta);
 +      }
 +
 +      return IkiWiki::Plugin::meta::get_sort_key($a, $meta)
 +              cmp
 +              IkiWiki::Plugin::meta::get_sort_key($b, $meta);
 +}
 +
 +# A prototype of how sort=title could behave in 4.0 or something
 +sub cmp_meta_title {
 +      $_[0] = 'title';
 +      return cmp_meta(@_);
 +}
 +
  1