Merge branch 'master' of gitlab.doc.ic.ac.uk:resource-reasoning/psvg.doc.ic.ac.uk

README.md

@@ -73,14 +73,15 @@ In the `scholar` section of the configuration file, configuration options we've
 * `repository`: Location of files associated with publications (`publications`) (the same
   directory is used for both input and output: it is handled as usual by jekyll)
 
-The template used to generate individual publication pages is [here](layout). The part of interest is the Source
-Materials section. We iterate through a [predefined list of file types](file-types) and output a link (using icon and
-text from the file type list) to the file in the repository if it exists.
-
-Finally, in order to generate the complete biography page, we use a [page](index) in the site's root just outputting a
-`{% bibliography %}` as normal (which renders each entry using the layout defined by the scholar `bibliography_template`
-option). By using a `permalink` jekyll option we place the rendered bibliography into the `/publications/` output
-directory as `index.html`.
+The template used to generate individual publication pages is [here](_layouts/publication.html). The part of interest is
+the Source Materials section. We iterate through a
+[predefined list of file types](publications/_publication_file_types.yml) and output a link (using icon and text from
+the file type list) to the file in the repository if it exists.
+
+Finally, in order to generate the complete biography page, we use a [page](publications.html) in the site's root just
+outputting a `{% bibliography %}` as normal (which renders each entry using the layout defined by the scholar
+`bibliography_template` option). By using a `permalink` jekyll option we place the rendered bibliography into the
+`/publications/` output directory as `index.html`.
 
 
 Testing and Deployment

Rakefile

@@ -15,7 +15,8 @@ end
 htmlproofer_config = {
   :disable_external => true,
   :check_html => true,
-  :parallel => { :in_processes => 1 }
+  :parallel => { :in_processes => 1 },
+  :file_ignore => [/README.html/]
 }
 
 desc "Build the site and test output for dead links, invalid html etc."