From ea1ce6cf2d8b87ef4a3621de90de0480e3008cf5 Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Sun, 5 Sep 2021 23:50:25 +0200
Subject: [PATCH 01/11] Add a Publication service to provide shared logic

---
 services/Publication.php | 156 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 services/Publication.php

diff --git a/services/Publication.php b/services/Publication.php
new file mode 100644
index 0000000..9e85c34
--- /dev/null
+++ b/services/Publication.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace YesWiki\Publication\Service;
+
+define('PUBLICATION_LAYOUT_BOOK', 'book');
+define('PUBLICATION_LAYOUT_FANZINE', 'fanzine');
+
+class Publication {
+  private $modes = [
+    PUBLICATION_LAYOUT_BOOK,
+    PUBLICATION_LAYOUT_FANZINE
+  ];
+
+  // Publication modes that require to load Paged.js to assemble the paged content
+  private $pagedLayouts = [
+    PUBLICATION_LAYOUT_BOOK
+  ];
+
+  private $fanzineLayouts = [
+    // one page, folded in 4 (8 pages per sheet)
+    // see https://en.wikibooks.org/wiki/Zine_Making/Putting_pages_together#Single-page_options
+    'single-page',
+    // many pages, folded in 2 (2 pages per sheet)
+    // see https://support.epson.net/fun/articles/86
+    'recto-folio',
+    // many pages, folded in 2, recto-verso (4 pages per sheet)
+    // see https://en.wikibooks.org/wiki/Zine_Making/Putting_pages_together#Folio_(folding_in_half)
+    // 'recto-verso-folio',
+    // many pages, folded in 4, recto-verso (8 pages per sheet)
+    // see https://en.wikibooks.org/wiki/Zine_Making/Putting_pages_together#Quarto_(folding_in_quarter)
+    // 'recto-verso-quarto',
+    // many pages, folded in 6, recto verso (12 pages per sheet)
+    // see https://en.wikibooks.org/wiki/Zine_Making/Putting_pages_together#Folding_into_six
+    // 'recto-verso-sexto'
+  ];
+
+  private $defaultOptions = [
+    // Publication options
+    "publication" => [
+      "title" => '',
+      "description" => '',
+      "authors" => ''
+    ],
+    "publication-hide-links-url" => '1',
+    "publication-cover-image" => '',
+    "publication-cover-page" => '0',
+    "publication-mode" => 'book',
+    // Book options
+    "publication-book" => [
+      "print-fold" => '0',
+      "print-marks" => '0',
+      "pagination" => 'bottom-center',
+      "page-format" => 'A4',
+      "page-orientation" => 'portrait',
+    ],
+    // Fanzine options
+    "publication-fanzine" => [
+      "layout" => 'single-page'
+    ],
+  ];
+
+  public function isMode($mode) {
+    return in_array($mode, $this->modes);
+  }
+
+  public function isPaged($layout) {
+    return in_array($layout, $this->pagedLayouts);
+  }
+
+  private function convertToNewOptionsFormat($options) {
+    // Publication Options
+    if (isset($options['publication-title'])) {
+      $options['publication']['title'] = $options['publication-title'];
+      unset($options['publication-title']);
+    }
+
+    if (isset($options['publication-description'])) {
+      $options['publication']['description'] = $options['publication-description'];
+      unset($options['publication-description']);
+    }
+
+    if (isset($options['publication-author'])) {
+      $options['publication']['authors'] = $options['publication-author'];
+      unset($options['publication-author']);
+    }
+
+    // Book Options
+    if (isset($options['publication-page-orientation'])) {
+      $options['publication-book']['page-orientation'] = $options['publication-page-orientation'];
+      unset($options['publication-page-orientation']);
+    }
+
+    if (isset($options['publication-page-format'])) {
+      $options['publication-book']['page-format'] = $options['publication-page-format'];
+      unset($options['publication-page-format']);
+    }
+
+    if (isset($options['publication-book-fold'])) {
+      $options['publication-book']['print-fold'] = $options['publication-book-fold'];
+      unset($options['publication-book-fold']);
+    }
+
+    if (isset($options['publication-print-marks'])) {
+      $options['publication-book']['print-marks'] = $options['publication-print-marks'];
+      unset($options['publication-print-marks']);
+    }
+
+    if (isset($options['publication-pagination'])) {
+      $options['publication-book']['pagination'] = $options['publication-pagination'];
+      unset($options['publication-pagination']);
+    }
+
+    return $options;
+  }
+
+  public function getOptions(...$args) {
+    $options = array_replace_recursive($this->defaultOptions, ...$args);
+    return $this->convertToNewOptionsFormat($options);
+  }
+
+  public function getStyles($metadatas, $options = []) {
+    $isDebug = $options['debug'] === 'yes';
+    $mode = $metadatas['publication-mode'];
+
+    return array_merge(
+      // Common styles
+      [
+        "yeswiki-publication",
+        "publication--" . $metadatas['publication-mode'],
+        $isDebug ? 'debug' : '',
+        // OPTION book-cover
+        $metadatas['publication-cover-page'] === '1' ? "publication--has-cover" : '',
+        // OPTION hide-links-from-print
+        $metadatas['publication-hide-links-url'] === '1' ? "hide-links-url" : '',
+      ],
+      /* BOOK Styles */
+      $mode === 'book' ? [
+        // could be chosen, when creating an eBook
+        "page-format--" . $metadatas['publication-book']['page-format'],
+        // could be chosen when creating an eBook
+        "page-orientation--" . $metadatas['publication-book']['page-orientation'],
+        // OPTION book-fold
+        $metadatas['publication-book']['print-fold'] === '1' ? "book-fold" : '',
+        // OPTION show-print-marks
+        $metadatas['publication-book']['print-marks'] === '1' ? "show-print-marks" : '',
+        // OPTION show-print-marks
+        "page-number-position--" . $metadatas['publication-book']['pagination'],
+
+      ] : [],
+      /* FANZINE Styles */
+      $mode === 'fanzine' ? [
+        "fanzine-" . $metadatas['publication-fanzine']['layout']
+      ] : [],
+    );
+  }
+}

From 557f005940d81ae66d78ee169ffa2da3d589b4ef Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Sun, 5 Sep 2021 23:55:22 +0200
Subject: [PATCH 02/11] Add a book mode (book, fanzine) in `{{
 publicationgenerator }}`

---
 actions/publicationgenerator.php              | 160 +++++++++---------
 presentation/actions/publicationgenerator.js  |  12 ++
 presentation/styles/publication.css           |  22 +++
 ...s_table.twig => publicationgenerator.twig} |  97 +++++++----
 4 files changed, 179 insertions(+), 112 deletions(-)
 rename templates/{exportpages_table.twig => publicationgenerator.twig} (68%)

diff --git a/actions/publicationgenerator.php b/actions/publicationgenerator.php
index 1c8c953..64d7714 100644
--- a/actions/publicationgenerator.php
+++ b/actions/publicationgenerator.php
@@ -13,24 +13,24 @@
  */
 
 use YesWiki\Bazar\Service\EntryManager;
+use YesWiki\Publication\Service\Publication;
 
 if (!defined("WIKINI_VERSION")) {
     die("acc&egrave;s direct interdit");
 }
 
 $entryManager = $this->services->get(EntryManager::class);
+$publicationService = $this->services->get(Publication::class);
 
 include_once 'tools/tags/libs/tags.functions.php';
 
-$this->addCssFile('tools/publication/presentation/styles/publication.css');
-
 // Format of the output. Either you want to generate an ebook or a newsletter
 // Default value is ebook
 $name = _t('PUBLICATION_EBOOK');
 $outputFormat = $this->getParameter('outputformat', 'Ebook');
 $messages = [];
 
-if ($outputFormat === 'newsletter') {
+if (strcasecmp($outputFormat, 'newsletter') === 0) {
     $formId = $this->getParameter('formid'); // Bazar form used to store the newsletter
     if (empty($formId)) {
         exit(_t('PUBLICATION_MISSING_NEWSLETTER_FORM'));
@@ -60,23 +60,20 @@
 
 // prefix for created pages
 // Only used when outputformat="ebook"
-$ebookPageNamePrefix = $this->getParameter('pagenameprefix', 'Ebook');
+$ebookPageNamePrefix = $this->getParameter('pagenameprefix', 'ebook');
 
 // include default pages in page listing ?
 $addInstalledPages = $this->getParameter('addinstalledpage');
 
-// default publication cover
-$default = [];
-$default['coverimage'] = $this->getParameter('coverimage');
-
-// default publication title
-$default['title'] = $this->getParameter('title');
-
-// default publication description
-$default['desc'] = $this->getParameter('desc');
-
-// default publication author
-$default['author'] = $this->getParameter('author');
+// defaults from the action
+$defaults = [
+  "publication-cover-image" => $this->getParameter('coverimage'),
+  "publication" => [
+    "title" => $this->getParameter('title'),
+    "description" => $this->getParameter('desc'),
+    "authors" => $this->getParameter('author') ?: $this->getParameter('authors'),
+  ]
+];
 
 // default added pages that can be used to separate content
 $chapterCoverPages = $this->getParameter('chapterpages');
@@ -92,9 +89,6 @@
     $chapterCoverPages = $a;
 }
 
-// app display template
-$template = $this->getParameter('template', 'exportpages_table');
-
 // titles for groups
 $titles = $this->getParameter('titles');
 if (!empty($titles)) {
@@ -206,16 +200,22 @@
 
 // Handling of data submitted by the form
 // Page creation
-if (isset($_POST["page"])) {
-    do { // use of a do-while loop in order to allow for breaks (in case of errors)
+
+if (isset($_POST) && count($_POST)) {
+  do { // use of a do-while loop in order to allow for breaks (in case of errors)
         if (!isset($_POST['antispam']) || $_POST['antispam'] != 1) {
             // There may be a spamming problem
-            $output = '<div class="alert alert-danger">' . _t('PUBLICATION_SPAM_RISK') . '</div>' . "\n";
+            array_push($messages, array('danger', _t('PUBLICATION_SPAM_RISK')));
+            break; // Stops the current do-while loop
+        }
+        if (!isset($_POST["page"]) || count($_POST["page"]) === 0) {
+            // There is no page selected
+            array_push($messages, array('danger', _t('PUBLICATION_NO_PAGE_FOUND')));
             break; // Stops the current do-while loop
         }
-        if (!isset($_POST["publication-title"]) || $_POST["publication-title"] == '') {
+        if (!isset($_POST["publication"]["title"]) || trim($_POST["publication"]["title"]) === '') {
             // There is no publication-title
-            $output = '<div class="alert alert-danger">' . _t('PUBLICATION_NO_TITLE_FOUND') . '</div>' . "\n";
+            array_push($messages, array('danger', _t('PUBLICATION_NO_TITLE_FOUND')));
             break; // Stops the current do-while loop
         }
 
@@ -231,7 +231,7 @@
                 if (isset($ebookPageName) && !empty($ebookPageName)) {
                     $pageName = $ebookPageName;
                 } else {
-                    $pageName = generatePageName($ebookPageNamePrefix . ' ' . $_POST["publication-title"]);
+                    $pageName = generatePageName($ebookPageNamePrefix . ' ' . $_POST["publication"]["title"]);
                 }
 
 
@@ -267,7 +267,7 @@
                     $output = $this->Format('""<div class="alert alert-danger alert-error">' . _t('PUBLICATION_EBOOK_PAGE_CREATION_FAILED') . '.""' . "\n" . '{{button class="btn-primary" link="' . $this->GetPageTag() . '" text="' . _t('PUBLICATION_GOTO_EBOOK_CREATION_PAGE') . ' ' . $this->GetPageTag() . '"}}""</div>""' . "\n");
                 }
             } while (false); // end of ebook specific loop
-        } elseif (strcasecmp($outputFormat, 'newsletter') == 0) { // We want to produce a newsletter
+        } elseif (strcasecmp($outputFormat, 'newsletter') === 0) { // We want to produce a newsletter
             $fiche['id_typeannonce'] = $formId;
             $fiche['bf_titre'] = $_POST["publication-title"];
             $fiche['bf_description'] = $_POST["publication-description"];
@@ -296,66 +296,64 @@
             array_push($messages, array('success', _t('PUBLICATION_NEWSLETTER_CREATED')));
         }
     } while (false); // End of global do-while loop
-} else { // Not isset($_POST["page"])
-    // recuperation des pages creees a l'installation
-    $installedPageNames = [];
-    if (!empty($addInstalledPages)) {
-        $d = dir("setup/doc/");
-        while ($doc = $d->read()) {
-            if ($doc == '.' || $doc == '..' || is_dir($doc) || substr($doc, -4) != '.txt') {
-                continue;
-            }
+}
 
-            if ($doc == '_root_page.txt') {
-                $installedPageNames[$this->GetConfigValue("root_page")] = $this->GetConfigValue("root_page");
-            } else {
-                $pageName = substr($doc, 0, strpos($doc, '.txt'));
-                $installedPageNames[$pageName] = $pageName;
-            }
+// recuperation des pages creees a l'installation
+$installedPageNames = [];
+if (!empty($addInstalledPages)) {
+    $d = dir("setup/doc/");
+    while ($doc = $d->read()) {
+        if ($doc == '.' || $doc == '..' || is_dir($doc) || substr($doc, -4) != '.txt') {
+            continue;
         }
-    }
 
-    if (isset($this->page["metadatas"]["publication-title"])) {
-        $ebookPageName = $this->GetPageTag();
-        preg_match_all('/{{include page="(.*)".*}}/Ui', $this->page['body'], $matches);
-        $publicationStart = $matches[1][0];
-        $last = count($matches[1]) - 1;
-        $publicationEnd = $matches[1][$last];
-        unset($matches[1][0]);
-        unset($matches[1][$last]);
-        foreach ($matches[1] as $key => $value) {
-            $pagesFiltre = filter_by_value($results, 'tag', $value);
-            $selectedPages[] = array_shift($pagesFiltre);
-            $key = array_keys($pagesFiltre);
-            if ($key && isset($pages[$key[0]])) {
-                unset($pages[$key[0]]);
-            }
+        if ($doc == '_root_page.txt') {
+            $installedPageNames[$this->GetConfigValue("root_page")] = $this->GetConfigValue("root_page");
+        } else {
+            $pageName = substr($doc, 0, strpos($doc, '.txt'));
+            $installedPageNames[$pageName] = $pageName;
         }
-    } else {
-        $ebookPageName = '';
-        $selectedPages = array();
     }
+}
 
-    $this->AddJavascriptFile('tools/publication/libs/vendor/jquery-ui-sortable/jquery-ui.min.js');
-    $this->AddJavascriptFile('tools/publication/presentation/actions/publicationgenerator.js');
-
-    $output .= $this->render('@publication/'.$template.'.twig', [
-      'messages' => $messages,
-      'entries' => $results,
-      'areParamsReadonly' => $areParamsReadonly,
-      'publicationStart' => $this->loadPage($publicationStart),
-      'publicationEnd' => $this->loadPage($publicationEnd),
-      'addInstalledPages' => $addInstalledPages,
-      'installedPageNames' => $installedPageNames,
-      'defaults' => $default,
-      'ebookPageName' => $ebookPageName,
-      'metaDatas' => $this->page["metadatas"],
-      'selectedPages' => $selectedPages,
-      'chapterCoverPages' => $chapterCoverPages,
-      'url' => $this->href('', $this->GetPageTag()),
-      'name' => $name,
-      'outputFormat' => $outputFormat,
-    ]);
+if (isset($this->page["metadatas"]["publication-title"])) {
+    $ebookPageName = $this->GetPageTag();
+    preg_match_all('/{{include page="(.*)".*}}/Ui', $this->page['body'], $matches);
+    $publicationStart = $matches[1][0];
+    $last = count($matches[1]) - 1;
+    $publicationEnd = $matches[1][$last];
+    unset($matches[1][0]);
+    unset($matches[1][$last]);
+    foreach ($matches[1] as $key => $value) {
+        $pagesFiltre = filter_by_value($results, 'tag', $value);
+        $selectedPages[] = array_shift($pagesFiltre);
+        $key = array_keys($pagesFiltre);
+        if ($key && isset($pages[$key[0]])) {
+            unset($pages[$key[0]]);
+        }
+    }
+} else {
+    $ebookPageName = '';
+    $selectedPages = array();
 }
 
-echo $output . "\n";
+$this->addCssFile('tools/publication/presentation/styles/publication.css');
+$this->AddJavascriptFile('tools/publication/libs/vendor/jquery-ui-sortable/jquery-ui.min.js');
+$this->AddJavascriptFile('tools/publication/presentation/actions/publicationgenerator.js');
+
+echo $this->render('@publication/publicationgenerator.twig', [
+  'messages' => $messages,
+  'entries' => $results,
+  'areParamsReadonly' => $areParamsReadonly,
+  'publicationStart' => $this->loadPage($publicationStart),
+  'publicationEnd' => $this->loadPage($publicationEnd),
+  'addInstalledPages' => $addInstalledPages,
+  'installedPageNames' => $installedPageNames,
+  'ebookPageName' => $ebookPageName,
+  'metadatas' => $publicationService->getOptions($defaults, $_POST, $this->page["metadatas"] ?: []),
+  'selectedPages' => $selectedPages,
+  'chapterCoverPages' => $chapterCoverPages,
+  'url' => $this->href('', $this->GetPageTag()),
+  'name' => $name,
+  'outputFormat' => $outputFormat,
+]);
diff --git a/presentation/actions/publicationgenerator.js b/presentation/actions/publicationgenerator.js
index c4cb24e..1198548 100644
--- a/presentation/actions/publicationgenerator.js
+++ b/presentation/actions/publicationgenerator.js
@@ -112,4 +112,16 @@ $(document).ready(function () {
         // Update the count
         filtercount.text(`Nombre de pages : ${count}`);
     });
+
+    /* Display ebook publication options (book, fanzine) */
+    $('[name="publication-mode"]').on('change', function (event) {
+      var mode = event.target.value
+      var $options = $('details.publication-options')
+
+      $options.not(`.options-${mode}`).attr('hidden', true)
+      $options.filter(`.options-${mode}`).removeAttr('hidden')
+    })
+
+    var mode = $('[name="publication-mode"][checked]').val()
+    $('details.publication-options').filter(`.options-${mode}`).removeAttr('hidden')
 });
diff --git a/presentation/styles/publication.css b/presentation/styles/publication.css
index bac4807..13299db 100644
--- a/presentation/styles/publication.css
+++ b/presentation/styles/publication.css
@@ -36,6 +36,28 @@
   margin-bottom: 1em;
 }
 
+.export-table-form [type="checkbox"] + span,
+.export-table-form [type="radio"] + span {
+  height: 1.4rem;
+  padding-left: 1.4rem; /* same as height to be "square" */
+}
+
+.export-table-form .radio .control-label,
+.export-table-form .checkbox .control-label,
+.export-table-form .radio-inline .control-label {
+  font-weight: bold;
+}
+.export-table-form .text-muted {
+  font-weight: normal;
+}
+
+.export-table-form .form-group.checkbox .control-label,
+.export-table-form .form-group.checkbox .control-label + .form-text,
+.export-table-form .form-row .radio-inline {
+  padding-left: 0;
+  vertical-align: top;
+}
+
 /* we reduce spacing for rows without .col-* elements inside */
 .export-table-form .form-row.clearfix .form-group {
   margin-top: 10px;
diff --git a/templates/exportpages_table.twig b/templates/publicationgenerator.twig
similarity index 68%
rename from templates/exportpages_table.twig
rename to templates/publicationgenerator.twig
index 4b7fb1d..a257a15 100644
--- a/templates/exportpages_table.twig
+++ b/templates/publicationgenerator.twig
@@ -37,7 +37,7 @@
 
   {% for nb,form in entries %}
   <section class="page-groups">
-    <h4>{{ form.name }}
+    <h4>{{ form['name'] }}
       <a class="pull-right btn-xs btn-success select-all" title="{{ _t('PUBLICATION_ADD_ALL') }}" href="#">
         <i class="fas fa-plus"></i>
         {{ _t('PUBLICATION_ADD_ALL') }}
@@ -163,10 +163,10 @@
 					<label for="publication-title" class="control-label">{{ _t('PUBLICATION_EBOOK_TITLE') }}<span aria-label="{{ _t('PUBLICATION_MANDATORY_FIELD') }}">*</span></label>
 					<div class="controls">
             {% if areParamsReadonly %}
-              <input type="hidden" required id="publication-title" name="publication-title" value="{{ metadatas['publication-title'] | default(defaults['title']) }}">
+              <input type="hidden" required id="publication-title" name="publication[title]" value="{{ metadatas['publication-title'] }}">
             {% endif %}
 
-            <input {{ areParamsReadonly ? 'readonly' }} class="control-group form-control" type="text" required="required" placeholder="{{ _t('PUBLICATION_EBOOK_TITLE') }}" id="publication-title" name="publication-title" value="{{ metadatas['publication-title'] | default(defaults['title']) }}">
+            <input {{ areParamsReadonly ? 'readonly' }} class="control-group form-control" type="text" required="required" placeholder="{{ _t('PUBLICATION_EBOOK_TITLE') }}" id="publication-title" name="publication[title]" value="{{ metadatas['publication']['title'] }}">
 					</div>
 				</div>
 
@@ -174,21 +174,21 @@
           <label for="publication-description" class="control-label">{{ _t('PUBLICATION_EBOOK_DESC') }}</label>
           <div class="controls">
             {% if areParamsReadonly %}
-              <input type="hidden" required id="publication-description" name="publication-description" value="{{ metadatas['publication-description'] | default(defaults['desc']) }}">
+              <input type="hidden" id="publication-description" name="publication[description]" value="{{ metadatas['publication-description'] }}">
             {% endif %}
 
-            <textarea {{ areParamsReadonly ? 'readonly' }} class="control-group form-control" placeholder="{{ _t('PUBLICATION_EBOOK_DESC') }}" id="publication-description" name="publication-description">{{ metadatas['publication-description'] | default(defaults['desc']) }}</textarea>
+            <textarea {{ areParamsReadonly ? 'readonly' }} class="control-group form-control" placeholder="{{ _t('PUBLICATION_EBOOK_DESC') }}" id="publication-description" name="publication[description]">{{ metadatas['publication']['description'] }}</textarea>
           </div>
         </div>
 
         <div class="form-group">
-          <label for="publication-author" class="control-label">{{ _t('PUBLICATION_EBOOK_AUTHOR') }}</label>
+          <label for="publication-authors" class="control-label">{{ _t('PUBLICATION_EBOOK_AUTHOR') }}</label>
           <div class="controls">
             {% if areParamsReadonly %}
-              <input type="hidden" required id="publication-author" name="publication-author" value="{{ metadatas['publication-author'] | default(defaults['author']) }}">
+              <input type="hidden" id="publication-authors" name="publication[authors]" value="{{ metadatas['publication-authors'] }}">
             {% endif %}
 
-            <input {{ areParamsReadonly ? 'readonly' }} class="control-group form-control" type="text" placeholder="{{ _t('PUBLICATION_EXAMPLE_AUTHOR') }}" id="publication-author" name="publication-author" value="{{ metadatas['publication-author'] | default(defaults['author']) }}">
+            <input {{ areParamsReadonly ? 'readonly' }} class="control-group form-control" type="text" placeholder="{{ _t('PUBLICATION_EXAMPLE_AUTHOR') }}" id="publication-authors" name="publication[authors]" value="{{ metadatas['publication']['authors'] }}">
           </div>
         </div>
 
@@ -197,30 +197,46 @@
 					<label for="publication-cover-image" class="control-label">{{ _t('PUBLICATION_EBOOK_COVER_IMAGE') }}</label>
 					<div class="controls">
             {% if areParamsReadonly %}
-              <input type="hidden" required id="publication-cover-image" name="publication-cover-image" value="{{ metadatas['publication-cover-image'] | default(defaults['coverimage']) }}">
+              <input type="hidden" required id="publication-cover-image" name="publication-cover-image" value="{{ metadatas['publication-cover-image'] }}">
             {% endif %}
 
-            <input {{ areParamsReadonly ? 'readonly' }} class="control-group form-control" type="url" placeholder="http://" id="publication-cover-image" name="publication-cover-image" value="{{ metadatas['publication-cover-image'] | default(defaults['coverimage']) }}">
+            <input {{ areParamsReadonly ? 'readonly' }} class="control-group form-control" type="url" placeholder="http://" id="publication-cover-image" name="publication-cover-image" value="{{ metadatas['publication-cover-image'] }}">
 					</div>
 				</div>
         {% endif %}
 
-        <details>
+        <div class="form-group">
+          <input type="checkbox" class="form-check-input" name="publication-cover-page" value="1" {{ publicationStart ? 'disabled' }} {{ metadatas['publication-cover-page'] == '1' ? 'checked' }} id="publication-cover-page">
+          <label for="publication-cover-page" class="control-label">{{ _t('PUBLICATION_EBOOK_COVER_PAGE') }}</label>
+          <small class="form-text text-muted">{{ publicationStart ? _t('PUBLICATION_EBOOK_COVER_PAGE_WITH_PUBLICATION_START_HELP') : _t('PUBLICATION_EBOOK_COVER_PAGE_HELP') }}</small>
+        </div>
+
+        {% if outputFormat|lower == 'ebook' %}
+        <div class="form-row">
+          <label class="d-block" for="publication-mode--book">{{ _t('PUBLICATION_MODE') }}</label>
+
+          <label class="radio-inline">
+            <input type="radio" id="publication-mode--book" name="publication-mode" value="book" {{ metadatas['publication-mode'] == 'book' ? 'checked' }}>
+            <span class="control-label">{{ _t('PUBLICATION_MODE_BOOK') }}</span>
+          </label>
+          <label class="radio-inline">
+            <input type="radio" id="publication-mode--fanzine" name="publication-mode" value="fanzine" {{ metadatas['publication-mode'] == 'fanzine' ? 'checked' }}>
+            <span class="control-label">{{ _t('PUBLICATION_MODE_FANZINE') }}</span>
+          </label>
+        </div>
+        {% endif %}
+
+        <details class="publication-options options-book" hidden>
           <summary>{{ _t('PUBLICATION_MORE_OPTIONS') }}</summary>
 
           <div class="form-row">
             <div class="form-group">
-              <input type="checkbox" class="form-check-input" name="publication-cover-page" value="1" {{ publicationStart ? 'disabled' : 'checked' }} id="publication-cover-page">
-              <label for="publication-cover-page" class="control-label">{{ _t('PUBLICATION_EBOOK_COVER_PAGE') }}</label>
-              <small class="form-text text-muted">{{ publicationStart ? _t('PUBLICATION_EBOOK_COVER_PAGE_WITH_PUBLICATION_START_HELP') : _t('PUBLICATION_EBOOK_COVER_PAGE_HELP') }}</small>
-            </div>
-            <div class="form-group">
-              <input type="checkbox" class="form-check-input" name="publication-book-fold" value="1" id="publication-book-fold">
+              <input type="checkbox" class="form-check-input" name="publication-book[print-fold]" value="1" id="publication-book-fold" {{ metadatas['publication-book']['print-fold'] == '1' ? 'checked' }}>
               <label for="publication-book-fold" class="control-label">{{ _t('PUBLICATION_EBOOK_FOLD') }}</label>
               <small class="form-text text-muted">{{ _t('PUBLICATION_EBOOK_FOLD_HELP') }}</small>
             </div>
             <div class="form-group">
-              <input type="checkbox" class="form-check-input" name="publication-print-marks" value="1" id="publication-print-marks">
+              <input type="checkbox" class="form-check-input" name="publication-book[print-marks]" value="1" id="publication-print-marks" {{ metadatas['publication-marks']['print-fold'] == '1' ? 'checked' }}>
               <label for="publication-print-marks" class="control-label">{{ _t('PUBLICATION_EBOOK_DISPLAY_PRINT_MARKS') }}</label>
               <small class="form-text text-muted">{{ _t('PUBLICATION_EBOOK_DISPLAY_PRINT_MARKS_HELP') }}</small>
             </div>
@@ -229,18 +245,18 @@
           <div class="form-row clearfix">
             <div class="form-group col-md-6">
               <label for="publication-page-format" class="control-label">{{ _t('PUBLICATION_EBOOK_FORMAT') }}</label>
-              <select class="form-control" name="publication-page-format" id="publication-page-format">
-                <option value="A3">A3</option>
-                <option value="A4" selected>A4</option>
-                <option value="A5">A5</option>
+              <select class="form-control" name="publication-book[page-format]" id="publication-page-format">
+                <option value="A3" {{ metadatas['publication-book']['page-format'] == 'A3' ? 'selected' }}>A3</option>
+                <option value="A4" {{ metadatas['publication-book']['page-format'] == 'A4' ? 'selected' }}>A4</option>
+                <option value="A5" {{ metadatas['publication-book']['page-format'] == 'A5' ? 'selected' }}>A5</option>
               </select>
             </div>
             <div class="form-group col-md-6">
               <label for="publication-page-orientation"
                 class="control-label">{{ _t('PUBLICATION_EBOOK_ORIENTATION') }}</label>
-              <select class="form-control" name="publication-page-orientation">
-                <option value="portrait" selected>{{ _t('PUBLICATION_EBOOK_ORIENTATION_PORTRAIT') }}</option>
-                <option value="landscape">{{ _t('PUBLICATION_EBOOK_ORIENTATION_LANDSCAPE') }}</option>
+              <select class="form-control" name="publication-book[page-orientation]">
+                <option value="portrait" {{ metadatas['publication-book']['page-orientation'] == 'portrait' ? 'selected' }}>{{ _t('PUBLICATION_EBOOK_ORIENTATION_PORTRAIT') }}</option>
+                <option value="landscape" {{ metadatas['publication-book']['page-orientation'] == 'landscape' ? 'selected' }}>{{ _t('PUBLICATION_EBOOK_ORIENTATION_LANDSCAPE') }}</option>
               </select>
             </div>
           </div>
@@ -249,16 +265,35 @@
             <label class="d-block" for="publication-pagination--bottom-center">{{ _t('PUBLICATION_PAGINATION_POSITION') }}</label>
 
             <label class="radio-inline">
-              <input type="radio" id="publication-pagination--none" name="publication-pagination" value="none">
-              {{ _t('PUBLICATION_PAGINATION_NONE') }}
+              <input type="radio" id="publication-pagination--none" name="publication-book[pagination]" value="none" {{ metadatas['publication-book']['pagination'] == 'none' ? 'checked' }}>
+              <span class="control-label">{{ _t('PUBLICATION_PAGINATION_NONE') }}</span>
             </label>
             <label class="radio-inline">
-              <input type="radio" id="publication-pagination--bottom-center" name="publication-pagination" value="bottom-center" checked>
-              {{ _t('PUBLICATION_PAGINATION_BOTTOM_CENTER') }}
+              <input type="radio" id="publication-pagination--bottom-center" name="publication-book[pagination]" value="bottom-center" {{ metadatas['publication-book']['pagination'] == 'bottom-center' ? 'checked' }}>
+              <span class="control-label">{{ _t('PUBLICATION_PAGINATION_BOTTOM_CENTER') }}</span>
             </label>
             <label class="radio-inline">
-              <input type="radio" id="publication-pagination--bottom-sides" name="publication-pagination" value="bottom-sides">
-              {{ _t('PUBLICATION_PAGINATION_BOTTOM_SIDES') }}
+              <input type="radio" id="publication-pagination--bottom-sides" name="publication-book[pagination]" value="bottom-sides" {{ metadatas['publication-book']['pagination'] == 'bottom-sides' ? 'checked' }}>
+              <span class="control-label">{{ _t('PUBLICATION_PAGINATION_BOTTOM_SIDES') }}</span>
+            </label>
+          </div>
+        </details>
+
+        <details class="publication-options options-fanzine" hidden>
+          <summary>{{ _t('PUBLICATION_MORE_OPTIONS') }}</summary>
+
+          <div class="form-row">
+            <label class="d-block" for="fanzine-layout--single-page">{{ _t('PUBLICATION_FANZINE_LAYOUT') }}</label>
+
+            <label class="radio">
+              <input type="radio" id="fanzine-layout--single-page" name="publication-fanzine[layout]" value="single-page" {{ metadatas['publication-fanzine']['layout'] == 'single-page' ? 'checked' }}>
+              <span class="control-label">{{ _t('PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE') }}</span>
+              <small class="form-text text-muted">{{ _t('PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE_HELP') }}</small>
+            </label>
+            <label class="radio">
+              <input type="radio" id="fanzine-layout--bottom-sides" name="publication-fanzine[layout]" value="recto-folio" {{ metadatas['publication-fanzine']['layout'] == 'recto-folio' ? 'checked' }}>
+              <span class="control-label">{{ _t('PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO') }}</span>
+              <small class="form-text text-muted">{{ _t('PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO_HELP') }}</small>
             </label>
           </div>
         </details>

From 5ed7e3dde9e0c9fadebadcdbb73245eddb90a04c Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Sun, 5 Sep 2021 23:58:32 +0200
Subject: [PATCH 03/11] Refactor of `{{ publicationlist }}` and the Publication
 view

---
 actions/publicationlist.php         | 10 ++++--
 templates/includes/publication.twig | 55 ++++++++++++++++++++++++++++
 templates/print-show.twig           | 56 -----------------------------
 templates/publicationlist.twig      | 56 ++---------------------------
 templates/show.twig                 |  5 +++
 5 files changed, 69 insertions(+), 113 deletions(-)
 create mode 100644 templates/includes/publication.twig
 delete mode 100644 templates/print-show.twig
 create mode 100644 templates/show.twig

diff --git a/actions/publicationlist.php b/actions/publicationlist.php
index 67500be..4605153 100644
--- a/actions/publicationlist.php
+++ b/actions/publicationlist.php
@@ -33,11 +33,15 @@
 *@version       $Revision: 0.1 $ $Date: 2010/03/04 14:19:03 $
 */
 
+use YesWiki\Publication\Service\Publication;
+
 if (!defined("WIKINI_VERSION")) {
     die ("acc&egrave;s direct interdit");
 }
 
 global $wiki;
+
+$publicationService = $this->services->get(Publication::class);
 $ebookPageNamePrefix = $this->getParameter('pagenameprefix', 'Ebook');
 
 $output = '';
@@ -45,13 +49,13 @@
 // recuperation des pages wikis
 $sql = 'SELECT DISTINCT resource FROM '.$this->GetConfigValue('table_prefix').'triples';
 $sql .= ' WHERE property="http://outils-reseaux.org/_vocabulary/metadata"
-			AND value LIKE "%publication-title%"
+			AND value LIKE "%publication-title%" OR value LIKE "%\publication\":{\"title\":%"
 			AND resource LIKE "'.$ebookPageNamePrefix.'%" ';
 $sql .= ' ORDER BY resource ASC';
 
-$pages = array_map(function($page) use ($wiki) {
+$pages = array_map(function($page) use ($wiki, $publicationService) {
   $metas = $wiki->GetMetadatas($page['resource']);
-  $page['_metas'] = $metas;
+  $page['_metas'] = $publicationService->getOptions($metas);
   return $page;
 }, $wiki->LoadAll($sql));
 
diff --git a/templates/includes/publication.twig b/templates/includes/publication.twig
new file mode 100644
index 0000000..6528c3d
--- /dev/null
+++ b/templates/includes/publication.twig
@@ -0,0 +1,55 @@
+<div class="row yw-publication__show">
+  <div class="col-sm-8">
+    <div class="thumbnail">
+      <div class="caption">
+        {% if metas['publication-cover-image'] %}
+          <img class="pull-right img-cover img-thumbnail" alt="" src="{{ metas['publication-cover-image'] | raw }}">
+        {% endif %}
+
+        <h3>{{ metas.publication.title }}</h3>
+
+        <p class="clearfix">{{ metas.publication.description }}</p>
+
+        <p class="text-muted">
+          <small>
+          {{ _t('PUBLICATION_MODE_%s' | format(metas['publication-mode'] | upper)) }},
+          {% if metas['publication-mode'] == 'book' %}
+            {{ metas['publication-book']['page-format'] }}
+            {{ _t('PUBLICATION_EBOOK_ORIENTATION_%s' | format(metas['publication-book']['page-orientation']| upper)) }}
+          {% elseif metas['publication-mode'] == 'fanzine' %}
+            {{ _t('PUBLICATION_FANZINE_LAYOUT_%s' | format(metas['publication-fanzine']['layout'] | replace({'-': '_'}) | upper)) }}
+          {% endif %}
+          </small>
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-sm-4">
+    <div class="btn-group-vertical" role="group" aria-label="">
+      <a href="{{ url({ handler: 'pdf', tag: tag }) }}" download type="application/pdf" class="btn btn-primary">
+        <i class="fas fa-book"></i>
+        {{ _t('PUBLICATION_VIEW_PDF') }}
+      </a>
+
+      {% if hasWriteAccess %}
+      <a href="{{ url({ handler: 'preview', tag: tag }) }}" class="btn btn-info btn-secondary">
+        <i class="fas fa-book-reader"></i>
+        {{ _t('PUBLICATION_PREVIEW') }}
+      </a>
+      {% endif %}
+
+      <a href="{{ url({ handler: 'share', tag: tag }) }}" class="btn btn-info btn-secondary modalbox">
+        <i class="fas fa-share-alt"></i>
+        {{ _t('TEMPLATE_SHARE') }}
+      </a>
+
+      {% if hasDeleteAccess %}
+      <a href="{{ url({ handler: 'deletepage', tag: tag }) }}" class="btn btn-danger link-deletepage modalbox">
+        <i class="fas fa-trash"></i>
+        {{ _t('TEMPLATE_DELETE') }}
+      </a>
+      {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/templates/print-show.twig b/templates/print-show.twig
deleted file mode 100644
index 57627ef..0000000
--- a/templates/print-show.twig
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="alert alert-info">
-  <p>{{ _t('PUBLICATION_SHOW_NOTICE') }}</p>
-</div>
-
-<div class="row yw-publication__show">
-  <div class="col-sm-8">
-    <div class="thumbnail">
-      <div class="caption">
-        {% if metadata['publication-cover-image'] %}
-          <img class="pull-right img-cover img-thumbnail" alt="" src="{{ metadata['publication-cover-image'] | raw }}">
-        {% endif %}
-
-        <h3>{{ metadata['publication-title'] }}</h3>
-
-        <p class="clearfix">{{ metadata['publication-description'] }}</p>
-
-        {% if hasWriteAccess %}
-        <p class="text-muted">
-          <small>
-            {{ metadata['publication-page-format'] }}
-            {{ _t('PUBLICATION_EBOOK_ORIENTATION_%s' | format(metadata['publication-page-orientation']| upper)) }}
-          </small>
-        </p>
-        {% endif %}
-      </div>
-    </div>
-  </div>
-
-  <div class="col-sm-4">
-    <div class="btn-group-vertical" role="group" aria-label="">
-      <a href="{{ url({ handler: 'pdf', tag: page['tag'] }) }}" download type="application/pdf" class="btn btn-primary">
-        <i class="fas fa-book"></i>
-        {{ _t('PUBLICATION_VIEW_PDF') }}
-      </a>
-
-      {% if hasWriteAccess %}
-      <a href="{{ url({ handler: 'preview', tag: page['tag'] }) }}" class="btn btn-info btn-secondary">
-        <i class="fas fa-book-reader"></i>
-        {{ _t('PUBLICATION_PREVIEW') }}
-      </a>
-      {% endif %}
-
-      <a href="{{ url({ handler: 'share', tag: page['tag'] }) }}" class="btn btn-info btn-secondary modalbox">
-        <i class="fas fa-share-alt"></i>
-        {{ _t('TEMPLATE_SHARE') }}
-      </a>
-
-      {% if hasDeleteAccess %}
-      <a href="{{ url({ handler: 'deletepage', tag: page['tag'] }) }}" class="btn btn-danger link-deletepage modalbox">
-        <i class="fas fa-trash"></i>
-        {{ _t('TEMPLATE_DELETE') }}
-      </a>
-      {% endif %}
-    </div>
-  </div>
-</div>
diff --git a/templates/publicationlist.twig b/templates/publicationlist.twig
index b9bf4df..83d7356 100644
--- a/templates/publicationlist.twig
+++ b/templates/publicationlist.twig
@@ -1,5 +1,4 @@
 {% if pages|length == 0 %}
-
 <div class="alert alert-info">
   {{ _t('PUBLICATION_NO_EBOOK_FOUND') }}
 </div>
@@ -7,59 +6,8 @@
 
 <ul class="media-list">
 {% for page in pages %}
-  {% set metas = page._metas %}
-  <li class="media" style="margin-bottom: 2em;">
-    <div class="media-left">
-      <a href="{{ url({ tag: page['resource'] }) }}" class="">
-        <img src="{{ metas['publication-cover-image'] }}" alt="" class="media-object" width="128">
-      </a>
-    </div>
-
-    <div class="media-body">
-      <h4 class="media-heading">
-        <a href="{{ url({ tag: page['resource']}) }}">{{ metas['publication-title'] }}</a>
-      </h4>
-
-      <p>
-        {% if metas['publication-author'] %}
-        Par {{ metas['publication-author'] }}<br>
-        {% endif %}
-        {{ metas['publication-description'] }}
-      </p>
-
-      {% if hasWriteAccess %}
-      <p class="text-muted">
-        <small>
-          {{ metas['publication-page-format'] }}
-          {{ _t('PUBLICATION_EBOOK_ORIENTATION_%s' | format(metas['publication-page-orientation'] | upper)) }}
-        </small>
-      </p>
-      {% endif %}
-
-      <div class="btn-group" role="group" aria-label="">
-        <a class="btn btn-xs btn-primary" href="{{ url({ handler: 'pdf', tag: page['resource'] }) }}">
-          <i class="fas fa-book"></i>&nbsp;
-          {{ _t('PUBLICATION_VIEW_PDF') }}
-        </a>
-
-        <a class="btn btn-xs btn-info" href="{{ url({ handler: 'preview', tag: page['resource'] }) }}">
-          <i class="fas fa-book-reader"></i>&nbsp;
-          {{ _t('PUBLICATION_PREVIEW') }}
-        </a>
-
-        <a href="{{ url({ handler: 'share', tag: page['resource'] }) }}" class="btn btn-xs btn-info btn-secondary modalbox">
-          <i class="fas fa-share-alt"></i>&nbsp;
-          {{ _t('TEMPLATE_SHARE') }}
-        </a>
-
-        {% if hasDeleteAccess %}
-        <a class="btn btn-xs btn-danger btn-error modalbox" href="{{ url({ handler: 'deletepage', tag: page['resource'] }) }}">
-          <i class="fas fa-trash"></i>&nbsp;
-          {{ _t('PUBLICATION_DELETE') }}
-        </a>
-        {% endif %}
-      </div>
-    </div>
+  <li class="media">
+    {% include '@publication/includes/publication.twig' with { 'metas': page._metas, 'tag': page.resource } %}
   </li>
 {% endfor %}
 </ul>
diff --git a/templates/show.twig b/templates/show.twig
new file mode 100644
index 0000000..5e2ac7f
--- /dev/null
+++ b/templates/show.twig
@@ -0,0 +1,5 @@
+<div class="alert alert-info">
+  <p>{{ _t('PUBLICATION_SHOW_NOTICE') }}</p>
+</div>
+
+{% include '@publication/includes/publication.twig' with { 'metas': metadata, 'tag': page.resource } %}

From b45fdd43355b172b809e9b680f88581eacc6f041 Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Mon, 6 Sep 2021 00:18:34 +0200
Subject: [PATCH 04/11] Modularize layouts

---
 handlers/page/preview.php                     | 127 ++++++-----
 handlers/page/show__.php                      |  24 +--
 lang/publication_en.inc.php                   |  13 +-
 lang/publication_fr.inc.php                   |  10 +-
 lang/publication_pt.inc.php                   |   8 +-
 .../{base.css => print-layouts/book.css}      |  73 +++++++
 presentation/styles/print-layouts/fanzine.css |  83 ++++++++
 presentation/styles/print.css                 | 198 +++++-------------
 templates/includes/image-cover.twig           |   8 +
 templates/print-layouts/base.twig             |  42 ++++
 templates/print-layouts/book.twig             |   1 +
 templates/print-layouts/fanzine.twig          |  16 ++
 templates/print-preview.twig                  |  42 ----
 13 files changed, 367 insertions(+), 278 deletions(-)
 rename presentation/styles/{base.css => print-layouts/book.css} (86%)
 create mode 100644 presentation/styles/print-layouts/fanzine.css
 create mode 100644 templates/includes/image-cover.twig
 create mode 100644 templates/print-layouts/base.twig
 create mode 100644 templates/print-layouts/book.twig
 create mode 100644 templates/print-layouts/fanzine.twig
 delete mode 100644 templates/print-preview.twig

diff --git a/handlers/page/preview.php b/handlers/page/preview.php
index 63c4c6c..5ad36f0 100644
--- a/handlers/page/preview.php
+++ b/handlers/page/preview.php
@@ -4,9 +4,11 @@
 use YesWiki\Bazar\Service\EntryManager;
 use YesWiki\Core\Service\PageManager;
 use YesWiki\Core\Service\TemplateEngine;
+use YesWiki\Publication\Service\Publication;
 
 global $wiki;
 
+$publicationService = $this->services->get(Publication::class);
 $publication = null;
 
 $entryManager = $wiki->services->get(EntryManager::class);
@@ -14,37 +16,41 @@
 $templateEngine = $wiki->services->get(TemplateEngine::class);
 
 /**
- * We print bazar list results
+ * Print from {{ bazar2publication }} (dynamic results)
  */
 if ($wiki->HasAccess('read') && isset($_GET['via']) && $_GET['via'] === 'bazarliste') {
-    // we assemble bazar pages
-    $content = '';
-    $templateName = 'rendered-entries.tpl.html';
-    if (!$templateEngine->hasTemplate('@bazar/'.$templateName)) {
-        // backward compatibilty
-        preg_match('#{{\s*bazar.+id="(.+)".+}}#siU', $wiki->page['body'], $matches);
-        list(, $formId) = $matches;
-
-        $query = isset($_GET['query']) ? $_GET['query'] : '';
-
-        $results = $entryManager->search(['query' => $query, 'formsIds' => [$formId]]);
-
-        $content = array_reduce($results, function ($html, $fiche) use ($entryController) {
-            return $html . $entryController->view($fiche);
-        }, '');
-    } elseif (preg_match('/({{(bazarliste|bazarcarto|calendrier|map|gogomap)\s[^}]*}})/i', $wiki->page['body'], $matches)) {
-        $actionText = $matches[1];
-        $actionName = $matches[2];
-        $matches = [];
-        $params = [];
-        if (preg_match_all('/([a-zA-Z0-9_]*)=\"(.*)\"/U', $actionText, $matches)) {
-            foreach ($matches[0] as $id => $match) {
-                $params[$matches[1][$id]] = $matches[2][$id];
-            }
-            // redefine template
-            $params['template'] = $templateName;
-            $content = $this->Action($actionName, 0, $params);
-        }
+  // we assemble bazar pages
+  $content = '';
+  $templateName = 'rendered-entries.tpl.html';
+  if (!$templateEngine->hasTemplate('@bazar/'.$templateName)) {
+      // backward compatibilty
+      preg_match('#{{\s*bazar.+id="(.+)".+}}#siU', $wiki->page['body'], $matches);
+      list(, $formId) = $matches;
+
+      $query = isset($_GET['query']) ? $_GET['query'] : '';
+
+      $results = $entryManager->search(['query' => $query, 'formsIds' => [$formId]]);
+
+      $content = array_reduce($results, function ($html, $fiche) use ($entryController) {
+          return $html . $entryController->view($fiche);
+      }, '');
+  }
+  /**
+   * Print from page, but render its {{ bazar* }} elements
+   */
+  elseif (preg_match('/({{(bazarliste|bazarcarto|calendrier|map|gogomap)\s[^}]*}})/i', $wiki->page['body'], $matches)) {
+      $actionText = $matches[1];
+      $actionName = $matches[2];
+      $matches = [];
+      $params = [];
+      if (preg_match_all('/([a-zA-Z0-9_]*)=\"(.*)\"/U', $actionText, $matches)) {
+          foreach ($matches[0] as $id => $match) {
+              $params[$matches[1][$id]] = $matches[2][$id];
+          }
+          // redefine template
+          $params['template'] = $templateName;
+          $content = $this->Action($actionName, 0, $params);
+      }
     }
 
     // we gather a few things from
@@ -67,10 +73,10 @@
         }
     }
 
-    $publication = array(
-    'metadatas' => isset($templatePage) ? $templatePage['metadatas'] : array(),
-    'content' => $content
-  );
+    $publication = [
+      'metadatas' => isset($templatePage) ? $templatePage['metadatas'] : array(),
+      'content' => $content
+    ];
 }
 
 /**
@@ -110,32 +116,32 @@
  */
 
 if ($publication) {
+    // user  options
+    $metadatas = $publicationService->getOptions($publication['metadatas'] ?? [], isset($_GET['layout'])
+     ? [ "publication-fanzine" => ["layout" => $_GET['layout'] ] ]
+     : []
+    );
+
+    //
+    if (!$publicationService->isMode($metadatas['publication-mode'])) {
+      //TODO turn into template
+      return 'Mode inconnu';
+    }
+
     // Load the cascade of publication styles
     $cssFiles = array_merge(
+      glob('tools/publication/presentation/styles/print-layouts/'.$metadatas['publication-mode'].'.css'),
       glob('tools/publication/presentation/styles/*.css'),
       glob('themes/'.$wiki->config['favorite_theme'].'/tools/publication/*.css'),
+      glob('themes/'.$wiki->config['favorite_theme'].'/tools/publication/print-layouts/'.$metadatas['publication-mode'].'.css'),
       glob('custom/tools/publication/*.css'),
+      glob('custom/tools/publication/print-layouts/'.$metadatas['publication-mode'].'.css'),
     );
 
     array_map(function($file) use ($wiki) {
       $wiki->AddCSSFile($file);
     }, $cssFiles);
 
-    // user  options
-    $options = array(
-        "publication-hide-links-url" => '1',
-        "publication-cover-image" => '',
-        "publication-cover-page" => '0',
-        "publication-book-fold" => '0',
-        "publication-page-format" => 'A4',
-        "publication-page-orientation" => 'portrait',
-        "publication-pagination" => "bottom-center",
-        "publication-print-marks" => '0',
-    );
-
-    $metadatas = array_merge($options, $publication['metadatas'] ?? []);
-    $blankpage = $wiki->Format('{{blankpage}}');
-
     // cover image
     $coverImage = '';
 
@@ -150,8 +156,10 @@
         }
     }
 
+    $blankpage = $wiki->Format('{{blankpage}}');
+
     // build the preview/printing page
-    $output = $templateEngine->render('@publication/print-preview.twig', [
+    $output = $templateEngine->render('@publication/print-layouts/'.$metadatas['publication-mode'].'.twig', [
         "baseUrl" => $wiki->getBaseUrl(),
         "blankpage" => $blankpage,
         "content" => $publication['content'],
@@ -159,24 +167,9 @@
         "siteTitle" => $wiki->GetConfigValue('wakka_name'),
         "metadatas" => $metadatas,
         "styles" => $wiki->Format('{{linkstyle}}{{linkjavascript}}'),
-        "stylesModifiers" => [
-            "yeswiki-publication",
-            $wiki->config['debug'] === 'yes' ? 'debug' : '',
-            // could be chosen, when creating an eBook
-            "page-format--" . $metadatas['publication-page-format'],
-            // could be chosen when creating an eBook
-            "page-orientation--" . $metadatas['publication-page-orientation'],
-            // OPTION book-cover
-            $metadatas['publication-cover-page'] === '1' ? "book-cover" : '',
-            // OPTION book-fold
-            $metadatas['publication-book-fold'] === '1' ? "book-fold" : '',
-            // OPTION show-print-marks
-            $metadatas['publication-print-marks'] === '1' ? "show-print-marks" : '',
-            // OPTION show-print-marks
-            "page-number-position--" . $metadatas['publication-pagination'],
-            // OPTION hide-links-from-print
-            $metadatas['publication-hide-links-url'] === '1' ? "hide-links-url" : '',
-        ],
+        //
+        "initialPublicationState" => $publicationService->isPaged($metadatas['publication-mode']) ?: 'ready',
+        "stylesModifiers" => $publicationService->getStyles($metadatas, ['debug' => $wiki->config['debug']]),
     ]);
 
     // Insert a blank page after a cover page
diff --git a/handlers/page/show__.php b/handlers/page/show__.php
index a4a4200..2bb0dec 100644
--- a/handlers/page/show__.php
+++ b/handlers/page/show__.php
@@ -1,26 +1,18 @@
 <?php
-global $wiki;
 
-if ($this->HasAccess('read') && isset($this->page['metadatas']['publication-title'])) {
-    // user  options
-    $options = array(
-        "publication-hide-links-url" => '1',
-        "publication-cover-page" => '0',
-        "publication-book-fold" => '0',
-        "publication-page-format" => 'A4',
-        "publication-page-orientation" => 'portrait',
-        "publication-pagination" => "bottom-center",
-        "publication-print-marks" => '0'
-    );
+use YesWiki\Publication\Service\Publication;
+
+global $wiki;
 
-    $metadata = array_merge($options, $wiki->page['metadatas']);
+if ($this->HasAccess('read') && (isset($this->page['metadatas']['publication-title']) || isset($this->page['metadatas']['publication']['title']))) {
+    $publicationService = $this->services->get(Publication::class);
+    $metadata = $publicationService->getOptions($wiki->page['metadatas']);
 
-    $output = $wiki->render('@publication/print-show.twig', [
+    $output = $wiki->render('@publication/show.twig', [
       'hasWriteAccess' => $wiki->HasAccess('write'),
       'hasDeleteAccess' => $wiki->UserIsAdmin() || $wiki->UserIsOwner(),
       'metadata' => $metadata,
-      'page' => $wiki->page,
-      'wiki' => $wiki,
+      'page' => $wiki->page
     ]);
 
     $plugin_output_new = preg_replace('#<div class="page".+<hr class="hr_clear" />#siU', '<div class="page" >'. $output .'<hr class="hr_clear" />', $plugin_output_new);
diff --git a/lang/publication_en.inc.php b/lang/publication_en.inc.php
index 16fd624..a6d10e2 100644
--- a/lang/publication_en.inc.php
+++ b/lang/publication_en.inc.php
@@ -23,8 +23,8 @@
 		'PUBLICATION_DOWNLOAD' => 'Download',
 		'PUBLICATION_DOWNLOAD_PDF' => 'PDF',
 		'PUBLICATION_EBOOK' => 'Ebook',
-		'PUBLICATION_EBOOK_AUTHOR' => 'Author\'s first name',
-		'PUBLICATION_EBOOK_COVER_IMAGE' => 'Link to ebook cover image',
+		'PUBLICATION_EBOOK_AUTHOR' => 'Author(s)',
+		'PUBLICATION_EBOOK_COVER_IMAGE' => 'Link to cover image',
 		'PUBLICATION_EBOOK_COVER_PAGE' => 'Generate a cover page automatically',
     'PUBLICATION_EBOOK_COVER_PAGE_HELP' => 'It will reuse the aforementioned informations.',
     'PUBLICATION_EBOOK_COVER_PAGE_WITH_PUBLICATION_START_HELP' => 'This setting cannot be enabled because a first page has already been&nbsp;set.',
@@ -44,6 +44,11 @@
 		'PUBLICATION_END_PAGE' => 'End page',
 		'PUBLICATION_EXAMPLE_AUTHOR' => 'Ex: Victor Hugo',
 		'PUBLICATION_EXPORT_PAGES_INFO' => 'Select your ebook content buy clicking on ',
+    'PUBLICATION_FANZINE_LAYOUT' => 'Page folding',
+    'PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE' => 'Single sheet (recto only)',
+    'PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE_HELP' => '8 pages printed on a single sheet.',
+    'PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO' => 'Folio (recto only)',
+    'PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO_HELP' => '2 pages per sheet, folded together.',
 		'PUBLICATION_FILTER_PAGES' => 'Filter content',
 		'PUBLICATION_FOR_THE_EBOOK' => 'For ebook',
 		'PUBLICATION_FROM_THE_EBOOK' => 'From ebook',
@@ -53,6 +58,9 @@
 		'PUBLICATION_INSERT_BLANK_PAGE' => 'Insert blank page',
 		'PUBLICATION_MANDATORY_FIELD' => 'Mandatory field',
 		'PUBLICATION_MISSING_NEWSLETTER_FORM' => 'In order to produce a newsletter, you must indicate a form id (See readme.md file).',
+    'PUBLICATION_MODE' => 'Disposition',
+    'PUBLICATION_MODE_BOOK' => 'Book, booklet',
+    'PUBLICATION_MODE_FANZINE' => 'Fanzine',
 		'PUBLICATION_MORE_OPTIONS' => 'Other customization options',
 		'PUBLICATION_NEWSLETTER' => 'Newsletter',
 		'PUBLICATION_NEWSLETTER_CREATED' => 'The newsletter record has successfully been created',
@@ -60,6 +68,7 @@
 		'PUBLICATION_NO_DESC_FOUND' => 'ERROR : Description hasn\'t been filled in.',
 		'PUBLICATION_NO_EBOOK_FOUND' => 'No ebook found.',
 		'PUBLICATION_NO_IMAGE_FOUND' => 'ERROR : Link to cover image hasn\'t been filled in.',
+		'PUBLICATION_NO_PAGE_FOUND' => 'ERROR : Please select at least one page to create a publication.',
 		'PUBLICATION_NO_TITLE_FOUND' => 'ERROR : Publication title hasn\'t been filled in.',
 		'PUBLICATION_NOT_IMAGE_FILE' => 'ERREUR : Cover image doesn\'t seem to be a jpg file.',
 		'PUBLICATION_PAGINATION_POSITION' => 'Page number position',
diff --git a/lang/publication_fr.inc.php b/lang/publication_fr.inc.php
index 1c9e6ba..4380059 100644
--- a/lang/publication_fr.inc.php
+++ b/lang/publication_fr.inc.php
@@ -24,9 +24,9 @@
         'PUBLICATION_DOWNLOAD' => 'Télécharger',
         'PUBLICATION_DOWNLOAD_PDF' => 'PDF',
         'PUBLICATION_EBOOK' => 'Ebook',
-        'PUBLICATION_EBOOK_AUTHOR' => 'Pr&eacute;nom puis nom de l\'auteur',
-        'PUBLICATION_EBOOK_COVER_IMAGE' => 'Lien vers l\'image de couverture de l\'ouvrage',
-        'PUBLICATION_EBOOK_COVER_PAGE' => 'Généreration automatique de la page de couverture',
+        'PUBLICATION_EBOOK_AUTHOR' => 'Auteur·ice(s)',
+        'PUBLICATION_EBOOK_COVER_IMAGE' => 'Lien vers l\'image de couverture',
+        'PUBLICATION_EBOOK_COVER_PAGE' => 'Génération automatique de la page de couverture',
         'PUBLICATION_EBOOK_COVER_PAGE_HELP' => 'Elle réutilisera les informations mentionnées ci-dessus.',
         'PUBLICATION_EBOOK_COVER_PAGE_WITH_PUBLICATION_START_HELP' => 'Ce réglage ne peut être activé car une page de couverture est déjà configurée.',
         'PUBLICATION_EBOOK_DESC' => 'Description',
@@ -54,6 +54,9 @@
         'PUBLICATION_INSERT_BLANK_PAGE' => 'Insérer une page blanche',
         'PUBLICATION_MANDATORY_FIELD' => 'Champ obligatoire',
         'PUBLICATION_MISSING_NEWSLETTER_FORM' => 'Vous devez préciser un id de formulaire pour produire une newsletter (reportez-vous au fichier readme.md).',
+        'PUBLICATION_MODE' => 'Disposition',
+        'PUBLICATION_MODE_BOOK' => 'Livre, livret',
+        'PUBLICATION_MODE_FANZINE' => 'Fanzine',
         'PUBLICATION_MORE_OPTIONS' => 'Autres options de personnalisation',
         'PUBLICATION_NEWSLETTER' => 'Newsletter',
         'PUBLICATION_NEWSLETTER_CREATED' => 'La newsletter a bien été créée',
@@ -61,6 +64,7 @@
         'PUBLICATION_NO_DESC_FOUND' => 'ERREUR : La description n\'a pas &eacute;t&eacute; renseign&eacute;.',
         'PUBLICATION_NO_EBOOK_FOUND' => 'Pas d\'ebook trouv&eacute;.',
         'PUBLICATION_NO_IMAGE_FOUND' => 'ERREUR : Le lien vers l\'image de couverture n\'a pas &eacute;t&eacute; renseign&eacute;.',
+        'PUBLICATION_NO_PAGE_FOUND' => '',
         'PUBLICATION_NO_TITLE_FOUND' => 'ERREUR : Le titre n\'a pas &eacute;t&eacute; renseign&eacute;.',
         'PUBLICATION_NOT_IMAGE_FILE' => 'ERREUR : Le lien vers l\'image de couverture n\'est pas une image avec l\'extension .jpg.',
         'PUBLICATION_PAGINATION_POSITION' => 'Emplacement de la numérotation des pages',
diff --git a/lang/publication_pt.inc.php b/lang/publication_pt.inc.php
index 4ea184b..c9b0b5d 100644
--- a/lang/publication_pt.inc.php
+++ b/lang/publication_pt.inc.php
@@ -23,8 +23,8 @@
 'PUBLICATION_DOWNLOAD' => 'Baixar',
 'PUBLICATION_DOWNLOAD_PDF' => 'PDF',
 'PUBLICATION_EBOOK' => 'Ebook',
-'PUBLICATION_EBOOK_AUTHOR' => 'Nome e sobrenome do autor',
-'PUBLICATION_EBOOK_COVER_IMAGE' => 'Link para a imagem da capa do livro',
+'PUBLICATION_EBOOK_AUTHOR' => 'Autor(es)',
+'PUBLICATION_EBOOK_COVER_IMAGE' => 'Link para a imagem da capa',
 'PUBLICATION_EBOOK_COVER_PAGE' => 'Geração automática da capa',
 'PUBLICATION_EBOOK_COVER_PAGE_HELP' => 'Irá reutilizar as informações mencionadas acima.',
 'PUBLICATION_EBOOK_COVER_PAGE_WITH_PUBLICATION_START_HELP' => 'Esta configuração não pode ser ativada porque uma capa já está configurada.',
@@ -53,6 +53,9 @@
 'PUBLICATION_INSERT_BLANK_PAGE' => 'Insira uma página em branco',
 'PUBLICATION_MANDATORY_FIELD' => 'Campo obrigatório',
 'PUBLICATION_MISSING_NEWSLETTER_FORM' => 'Você deve especificar um id de formulário para produzir uma newsletter (consulte o arquivo readme.md).',
+'PUBLICATION_MODE' => 'Disposição',
+'PUBLICATION_MODE_BOOK' => 'Livro, livreto',
+'PUBLICATION_MODE_FANZINE' => 'Fanzine',
 'PUBLICATION_MORE_OPTIONS' => 'Outras opções de personalização',
 'PUBLICATION_NEWSLETTER' => 'Newsletter',
 'PUBLICATION_NEWSLETTER_CREATED' => 'A newsletter foi criada',
@@ -60,6 +63,7 @@
 'PUBLICATION_NO_DESC_FOUND' => 'ERRO: A descrição não foi preenchida. ',
 'PUBLICATION_NO_EBOOK_FOUND' => 'Nenhum e-book encontrado.',
 'PUBLICATION_NO_IMAGE_FOUND' => 'ERRO: O link para a imagem da capa não foi preenchido. ',
+'PUBLICATION_NO_PAGE_FOUND' => '',
 'PUBLICATION_NO_TITLE_FOUND' => 'ERRO: O título não foi preenchido. ',
 'PUBLICATION_NOT_IMAGE_FILE' => 'ERRO: O link para a imagem da capa não é uma imagem com a extensão .jpg.',
 'PUBLICATION_PAGINATION_POSITION' => 'Localização da numeração da página',
diff --git a/presentation/styles/base.css b/presentation/styles/print-layouts/book.css
similarity index 86%
rename from presentation/styles/base.css
rename to presentation/styles/print-layouts/book.css
index 0b2c87d..7414432 100644
--- a/presentation/styles/base.css
+++ b/presentation/styles/print-layouts/book.css
@@ -1,3 +1,66 @@
+body {
+  font-size: 1rem;
+  line-height: 1.33;
+}
+
+@page {
+  size: A4 portrait;
+  margin: 20mm 25mm; /* marks: crop; */
+
+  @footnote {
+    margin: 0.6rem 0 0 0;
+    padding: 0.3rem 0 0 0;
+    max-height: 10rem;
+  }
+  @top-center {
+    vertical-align: bottom;
+    padding-bottom: 10mm;
+    content: string(booktitle);
+  }
+}
+
+@page :left {
+  margin: 20mm 40mm 20mm 30mm;
+  @top-left {
+    vertical-align: bottom;
+    padding-bottom: 10mm;
+    content: string(page-number, first-except);
+    letter-spacing: 0.1rem;
+    margin-left: -1rem;
+    font-size: 0.9rem;
+  }
+  @bottom-left-corner {
+    content: counter(page);
+  }
+}
+
+@page :right {
+  margin: 20mm 30mm 20mm 40mm;
+  @top-right {
+    vertical-align: bottom;
+    padding-bottom: 10mm;
+    content: string(page-number, first-except);
+    letter-spacing: 0.08rem;
+    margin-right: -1rem;
+    font-size: 0.9rem;
+  }
+  @bottom-right-corner {
+    content: counter(page);
+  }
+  @top-center {
+    content: string(booktitle);
+  }
+}
+@page cover {
+  @top-center {
+    content: none;
+  }
+}
+
+section:nth-child(1) h1 {
+  string-set: booktitle content(text);
+}
+
 /**
  * Writing helpers
  */
@@ -337,3 +400,13 @@
 .yeswiki-publication.hide-links-url a[href]::after{
   content: "";
 }
+
+/* */
+section {
+  break-before: right;
+  break-after: always;
+}
+
+h1 {
+  page-break-before: always;
+}
diff --git a/presentation/styles/print-layouts/fanzine.css b/presentation/styles/print-layouts/fanzine.css
new file mode 100644
index 0000000..95bc0af
--- /dev/null
+++ b/presentation/styles/print-layouts/fanzine.css
@@ -0,0 +1,83 @@
+@page {
+  size: landscape;
+  margin: 0;
+  bleed: 0;
+}
+
+html.html-publication {
+  font-size: 55% !important;
+}
+
+body.publication--fanzine {
+  font-size: 1rem !important
+}
+
+/** SINGLE FILE */
+/* fanzine wrapper */
+.fanzine-single-page .fanzine {
+  width: 100vw;
+  height: calc(100vh - 2px);
+  display: grid;
+  gap: 1px;
+  background: lightgrey !important;
+  grid-template-areas:
+    "page-5 page-4 page-3 page-2"
+    "page-6 page-7 page-8 page-1";
+}
+
+  /* page */
+  .fanzine-single-page .fanzine > * {
+    background: white !important;
+    overflow: hidden;
+  }
+
+  .fanzine-single-page .fanzine > :nth-child(1) {
+    grid-area: page-1;
+  }
+  .fanzine-single-page .fanzine > :nth-child(2) {
+    grid-area: page-2;
+  }
+  .fanzine-single-page .fanzine > :nth-child(3) {
+    grid-area: page-3;
+  }
+  .fanzine-single-page .fanzine > :nth-child(4) {
+    grid-area: page-4;
+  }
+  .fanzine-single-page .fanzine > :nth-child(5) {
+    grid-area: page-5;
+  }
+  .fanzine-single-page .fanzine > :nth-child(6) {
+    grid-area: page-6;
+  }
+  .fanzine-single-page .fanzine > :nth-child(7) {
+    grid-area: page-7;
+  }
+  .fanzine-single-page .fanzine > :nth-child(8) {
+    grid-area: page-8;
+  }
+
+  .fanzine-single-page .fanzine > :nth-child(5),
+  .fanzine-single-page .fanzine > :nth-child(4),
+  .fanzine-single-page .fanzine > :nth-child(3),
+  .fanzine-single-page .fanzine > :nth-child(2) {
+    transform: rotate(180deg) translateX(-0.25px);
+  }
+
+/** */
+.fanzine-recto-folio .fanzine {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 1px;
+  background: lightgrey !important;
+}
+
+  .fanzine-recto-folio .fanzine > * {
+    background: white !important;
+    overflow: hidden;
+    height: calc(100vh - 2px);
+  }
+  .fanzine-recto-folio .fanzine > :nth-child(2n) {
+    page-break-after: always;
+  }
+
+
diff --git a/presentation/styles/print.css b/presentation/styles/print.css
index 21a6ad4..d0898ca 100644
--- a/presentation/styles/print.css
+++ b/presentation/styles/print.css
@@ -1,84 +1,4 @@
-@page {
-  size: 8.5in 11in;
-  margin: 20mm 25mm; /* marks: crop; */
-  @footnote {
-    margin: 0.6em 0 0 0;
-    padding: 0.3em 0 0 0;
-    max-height: 10em;
-  }
-  @top-center {
-    vertical-align: bottom;
-    padding-bottom: 10mm;
-    content: string(booktitle);
-  }
-}
-@page :left {
-  margin: 20mm 40mm 20mm 30mm;
-  @top-left {
-    vertical-align: bottom;
-    padding-bottom: 10mm;
-    content: string(page-number, first-except);
-    letter-spacing: 0.1em;
-    margin-left: -1em;
-    font-size: 0.9em;
-  }
-  @bottom-left-corner {
-    content: counter(page);
-  }
-}
-@page :right {
-  margin: 20mm 30mm 20mm 40mm;
-  @top-right {
-    vertical-align: bottom;
-    padding-bottom: 10mm;
-    content: string(page-number, first-except);
-    letter-spacing: 0.08em;
-    margin-right: -1em;
-    font-size: 0.9em;
-  }
-  @bottom-right-corner {
-    content: counter(page);
-  }
-  @top-center {
-    content: string(booktitle);
-  }
-}
-@page cover {
-  @top-center {
-    content: none;
-  }
-}
-@font-face {
-  font-family: "Stix";
-  font-weight: normal;
-  font-style: normal;
-}
-@font-face {
-  font-family: "Stix";
-  font-weight: bold;
-  font-style: normal;
-}
-@font-face {
-  font-family: "Stix";
-  font-weight: normal;
-  font-style: italic;
-}
-@font-face {
-  font-family: "Stix";
-  font-weight: bold;
-  font-style: italic;
-}
-section:nth-child(1) h1 {
-  string-set: booktitle content(text);
-}
-section {
-  break-before: right;
-  break-after: always;
-}
 body {
-  font-size: 1em;
-  line-height: 1.33em;
-  font-family: "Stix", serif;
   font-variant-numeric: oldstyle-nums;
 }
 p {
@@ -89,26 +9,26 @@ p {
 header + p:first-line {
   text-transform: lowercase !important;
   font-variant: small-caps;
-  font-size: 1.1em;
+  font-size: 1.1rem;
 }
 p + p {
-  text-indent: 1.33em;
+  text-indent: 1.33rem;
 }
 .decoration-rw {
   text-align: center;
-  padding-top: 1em;
-  padding-bottom: 1em;
-  padding-left: 0em;
-  padding-right: 0em;
+  padding-top: 1rem;
+  padding-bottom: 1rem;
+  padding-left: 0;
+  padding-right: 0;
 }
 .copyright-rw {
-  font-size: 0.8em;
-  line-height: 1em;
+  font-size: 0.8rem;
+  line-height: 1rem;
   text-align: left;
-  padding-top: 2em;
+  padding-top: 2rem;
 }
 .copyright-rw p {
-  margin-bottom: 1em;
+  margin-bottom: 1rem;
   text-indent: 0;
 }
 .dedication-rw p {
@@ -116,19 +36,20 @@ p + p {
   text-indent: 0;
 }
 .Dedication-rw {
-  margin-top: 3em;
+  margin-top: 3rem;
 }
 .leading-line-rw {
-  height: 1.33em;
+  height: 1.33rem;
 }
 .fp-rw {
   text-indent: 0;
 }
-h1 {
-  font-size: 1.5em;
-  line-height: 1.33em;
+h1,
+.BAZ_fiche_titre {
+  font-size: 1.5rem;
+  line-height: 1.33;
   text-align: center;
-  padding-bottom: 0em;
+  padding-bottom: 0;
   text-align: center;
   text-transform: uppercase;
   font-weight: normal;
@@ -136,10 +57,10 @@ h1 {
 }
 h2 {
   text-align: center;
-  font-size: 1.33em;
-  line-height: 1.2em;
+  font-size: 1.33rem;
+  line-height: 1.2rem;
   text-align: center;
-  padding-bottom: 0em;
+  padding-bottom: 0;
   text-align: center;
   text-transform: uppercase;
   font-weight: normal;
@@ -147,32 +68,32 @@ h2 {
 }
 .title-author-rw {
   text-align: center;
-  font-size: 1.5em;
+  font-size: 1.5rem;
   text-indent: 0;
 }
 .title-num-rw {
   text-align: center;
-  font-size: 1.5em;
+  font-size: 1.5rem;
   text-indent: 0;
-  margin-top: 1em;
-  margin-bottom: 1em;
+  margin-top: 1rem;
+  margin-bottom: 1rem;
 }
 .title-sub-rw {
   text-align: center;
-  font-size: 1.5em;
+  font-size: 1.5rem;
   text-indent: 0;
 }
 .imprint-rw {
   text-align: center;
 }
 .extract-verse-rw {
-  margin-top: 1.33em;
-  margin-bottom: 1.33em;
+  margin-top: 1.33rem;
+  margin-bottom: 1.33rem;
   padding-left: 20pt;
 }
 .extract-rw {
-  margin-top: 1.33em;
-  margin-bottom: 1.33em;
+  margin-top: 1.33rem;
+  margin-bottom: 1.33rem;
   padding-left: 20pt;
 }
 .extract-verse-rw p {
@@ -181,8 +102,8 @@ h2 {
   margin-left: 20pt;
 }
 .epigraph-rw {
-  margin-top: 1.33em;
-  margin-bottom: 1.33em;
+  margin-top: 1.33rem;
+  margin-bottom: 1.33rem;
   padding-left: 20pt;
   padding-right: 20pt;
 }
@@ -190,15 +111,15 @@ h2 {
   font-size: 75%;
 }
 .block-rw {
-  margin-top: 1em;
-  margin-bottom: 1em;
+  margin-top: 1rem;
+  margin-bottom: 1rem;
   margin-left: 20pt;
   margin-right: 20pt;
 }
 span.dropcap-rw {
   float: left;
-  font-size: 2.7em;
-  line-height: 0.87em;
+  font-size: 2.7rem;
+  line-height: 0.87rem;
 }
 .signature-rw {
   margin-left: 50%;
@@ -224,17 +145,17 @@ a {
 }
 #toc ol {
   list-style-type: none;
-  margin: 0 0 0 2em;
+  margin: 0 0 0 2rem;
   padding: 0 0 0 0;
 }
 #toc ol ol {
   list-style-type: none;
-  margin: 0 0 0 1em;
+  margin: 0 0 0 1rem;
   padding: 0 0 0 0;
 }
 #toc ol li {
-  margin: 0 0 0 0;
-  padding: 0 0 0 0;
+  margin: 0;
+  padding: 0;
 }
 #toc ol li a {
   text-decoration: none;
@@ -246,14 +167,14 @@ a {
 }
 .toc-short ol {
   list-style-type: none;
-  margin: 0 0 0 2em;
-  padding: 0 0 0 0;
+  margin: 0 0 0 2rem;
+  padding: 0;
 }
 #guide {
   display: none;
 }
 header {
-  padding: 3em 0 2em 0;
+  padding: 3rem 0 2rem 0;
 }
 header a {
   text-decoration: none;
@@ -270,32 +191,32 @@ img {
 .title-other-rw {
   text-align: center;
   text-indent: 0;
-  margin-top: 0.5em;
+  margin-top: 0.5rem;
 }
 .dateline-rw {
   text-align: left;
   text-indent: 0;
-  margin-top: 1.33em;
-  margin-bottom: 1.33em;
+  margin-top: 1.33rem;
+  margin-bottom: 1.33rem;
 }
 .frontmatter-rw h1 {
-  font-size: 1.5em;
+  font-size: 1.5rem;
 }
 .backmatter-rw h1 {
-  font-size: 1.5em;
+  font-size: 1.5rem;
 }
 .direction-rw {
   text-align: center;
   text-indent: 0;
   font-style: italic;
-  margin: 1em 0 1em 0;
+  margin: 1rem 0 1rem 0;
 }
 .source-rw {
-  margin-bottom: 0em;
+  margin-bottom: 0;
   text-align: right !important;
   font-variant: small-caps;
   text-transform: lowercase;
-  font-size: 1.1em;
+  font-size: 1.1rem;
   page-break-before: avoid;
 }
 div.block-rw {
@@ -313,8 +234,8 @@ div.block-rw {
   padding-top: 6px;
 }
 div.photo {
-  margin-top: 1em;
-  padding-top: 2em;
+  margin-top: 1rem;
+  padding-top: 2rem;
   text-align: center;
 }
 div.photo p {
@@ -325,18 +246,3 @@ div.photo p {
 .-epub-media-overlay-active {
   background-color: #abc;
 }
-
-h1 {
-  page-break-before: always;
-}
-
-@media all and (orientation: portrait) {
-  p {
-    font-family: serif;
-  }
-}
-@media all and (orientation: landscape) {
-  p {
-    font-family: sans-serif;
-  }
-}
diff --git a/templates/includes/image-cover.twig b/templates/includes/image-cover.twig
new file mode 100644
index 0000000..8dae0d0
--- /dev/null
+++ b/templates/includes/image-cover.twig
@@ -0,0 +1,8 @@
+<div class="include publication-cover">
+	<h1 class="publication-title">{{ metadatas.publication.title }}</h1>
+
+	{{ coverImage }}
+
+	<p class="publication-description">{{ metadatas.publication.description }}</p>
+	<p class="publication-author publication-authors">{{ metadatas.publication.authors }}</p>
+</div>
diff --git a/templates/print-layouts/base.twig b/templates/print-layouts/base.twig
new file mode 100644
index 0000000..eea1ca4
--- /dev/null
+++ b/templates/print-layouts/base.twig
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html class="html-publication">
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width">
+		<title>{{ metadatas['publication-title'] | default('Publication') }} • {{ siteTitle }}</title>
+		{{ styles | raw }}
+
+    {% block css %}
+    <style type="text/css">
+			@media print {
+				@page {
+					size: {{metadatas['publication-page-format']}}
+					{{metadatas['publication-page-orientation']}}
+					;
+					{% if metadatas['publication-print-marks'] == '1' %}
+						bleed: 6mm;
+						marks: crop cross;
+					{% endif %}
+				}
+			}
+    </style>
+    {% endblock %}
+
+    {% block js %}
+		<!-- Paged.js handles the printing layout -->
+		<script type="module" src="{{ baseUrl }}/tools/publication/presentation/browser/print.js"></script>
+    {% endblock %}
+    <script src="{{ baseUrl }}/tools/publication/presentation/browser/is-pdf-ready.js"></script>
+  </head>
+
+	<body class="{{ stylesModifiers | join(' ') }}" data-publication="{{ initialPublicationState | default('awaiting-layout') }}">
+    {% block publication %}
+      {% if metadatas['publication-cover-page'] == '1' %}
+        {% include "@publication/includes/image-cover.twig" %}
+      {% endif %}
+
+      {{ content | raw }}
+    {% endblock %}
+	</body>
+</html>
+
diff --git a/templates/print-layouts/book.twig b/templates/print-layouts/book.twig
new file mode 100644
index 0000000..a82e7a1
--- /dev/null
+++ b/templates/print-layouts/book.twig
@@ -0,0 +1 @@
+{% extends "@publication/print-layouts/base.twig" %}
diff --git a/templates/print-layouts/fanzine.twig b/templates/print-layouts/fanzine.twig
new file mode 100644
index 0000000..2a27ad0
--- /dev/null
+++ b/templates/print-layouts/fanzine.twig
@@ -0,0 +1,16 @@
+{% extends "@publication/print-layouts/base.twig" %}
+
+{% block css %}{% endblock %}
+{% block js %}{% endblock %}
+
+{% block publication %}
+<div class="fanzine">
+	{% if metadatas['publication-cover-page'] == '1' %}
+		{% include "@publication/includes/image-cover.twig" %}
+	{% endif %}
+
+	{{ content | raw }}
+</div>
+{% endblock %}
+
+
diff --git a/templates/print-preview.twig b/templates/print-preview.twig
deleted file mode 100644
index 37b5705..0000000
--- a/templates/print-preview.twig
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width">
-		<title>{{ metadatas['publication-title'] | default('Publication') }} • {{ siteTitle }}</title>
-		{{ styles | raw }}
-
-		<style type="text/css">
-			@media print {
-				@page { size: {{ metadatas['publication-page-format'] }} {{ metadatas['publication-page-orientation'] }};
-				{% if metadatas['publication-print-marks'] == '1' %}
-						bleed: 6mm;
-						marks: crop cross;
-				{% endif %}
-				}
-			}
-		</style>
-
-		<!-- Paged.js handles the printing layout -->
-		<script type="module" src="{{ baseUrl }}/tools/publication/presentation/browser/print.js"></script>
-		<script src="{{ baseUrl }}/tools/publication/presentation/browser/is-pdf-ready.js"></script>
-	</head>
-
-	<body class="{{ stylesModifiers | join(' ') }}">
-		{% if metadatas['publication-cover-page'] == '1' %}
-			<div class="include publication-cover">
-        <h1 class="publication-title">{{ metadatas['publication-title'] }}</h1>
-
-
-				{{ coverImage }}
-
-        <p class="publication-description">{{ metadatas['publication-description'] }}</p>
-        <p class="publication-author">{{ metadatas['publication-author'] }}</p>
-
-			</div>
-		{% endif %}
-
-		{{ content | raw }}
-	</body>
-</html>
-

From 4bddd4e9f1f632acc48854f492a8b04de6a9dac3 Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Mon, 6 Sep 2021 00:19:33 +0200
Subject: [PATCH 05/11] Fix an issue with printing within a Docker container
 with port 80

---
 handlers/page/pdf.php       | 11 ++++++-----
 handlers/page/preview__.php |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/handlers/page/pdf.php b/handlers/page/pdf.php
index e419936..80d8719 100644
--- a/handlers/page/pdf.php
+++ b/handlers/page/pdf.php
@@ -47,7 +47,7 @@
     $pageTag = $this->GetPageTag();
     $pdfTag = $this->MiniHref('pdf', $pageTag);
     $sourceUrl = $this->href('preview', $pageTag, preg_replace('#^'. $pdfTag .'&?#', '', $_SERVER['QUERY_STRING']), false);
-    
+
     $pdfHelper = $this->services->get(PdfHelper::class);
 
     $hash = substr(sha1($pagedjs_hash . json_encode(array_merge(
@@ -107,14 +107,15 @@
 
             // now generate PDF
             $page->pdf(array(
-          'printBackground' => true,
-          'displayHeaderFooter' => true,
-          'preferCSSPageSize' => true
-        ))->saveToFile($fullFilename);
+              'printBackground' => true,
+              'displayHeaderFooter' => true,
+              'preferCSSPageSize' => true
+            ))->saveToFile($fullFilename);
 
             $browser->close();
         } catch (Exception $e) {
             echo $this->Header()."\n";
+            echo '<div class="alert alert-info">'.$sourceUrl.'</div>'."\n";
             echo '<div class="alert alert-danger alert-error">'.$e->getMessage().'</div>'."\n";
 
             if (($e instanceof HeadlessChromium\Exception\OperationTimedOut) === false) {
diff --git a/handlers/page/preview__.php b/handlers/page/preview__.php
index 3835010..864c707 100644
--- a/handlers/page/preview__.php
+++ b/handlers/page/preview__.php
@@ -2,16 +2,16 @@
 
 if ($this->config['htmltopdf_base_url']) {
   ['scheme' => $scheme, 'host' => $host, 'port' => $port] = parse_url($this->config['base_url']);
-  $base_url = $scheme . '://' . $host . (!$port || (string)$port === '80' ? '' : ':'.$port);
+  $base_url = $scheme . '://' . $host . (!$port || (string)$port === '80' ? '' : ':'.$port) . '/';
 
   ['scheme' => $scheme, 'host' => $host, 'port' => $port] = parse_url($this->config['htmltopdf_base_url']);
-  $new_base_url = $scheme . '://' . $host . (!$port || (string)$port === '80' ? '' : ':'.$port);
+  $new_base_url = $scheme . '://' . $host . (!$port || (string)$port === '80' ? '' : ':'.$port) . '/';
 
   $full_request_url = $_SERVER['REQUEST_SCHEME'] . '://'. $_SERVER['HTTP_HOST'] . ((string)$_SERVER['SERVER_PORT'] === '80' ? '' : ':'.$_SERVER['SERVER_PORT']) . $_SERVER['REQUEST_URI'];
 
   // Replaces https://example.com/?Accueil by http://localhost:8000/?Accueil
   // Replaces https://example.com/favicon.ico by http://localhost:8000/favicon.ico
-  if (strpos($full_request_url, $this->config['htmltopdf_base_url']) === 0) {
+  if (strpos($full_request_url, $new_base_url) === 0) {
     $plugin_output_new = str_replace([$this->config['base_url'], $base_url], [$this->config['htmltopdf_base_url'], $new_base_url], $plugin_output_new);
   }
 }

From ba166c54e87c8cd6aa1fed843f75be55684318d4 Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Mon, 6 Sep 2021 11:59:25 +0200
Subject: [PATCH 06/11] Update translations

---
 lang/publication_fr.inc.php |  7 ++++++-
 lang/publication_pt.inc.php | 13 +++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lang/publication_fr.inc.php b/lang/publication_fr.inc.php
index 4380059..8547499 100644
--- a/lang/publication_fr.inc.php
+++ b/lang/publication_fr.inc.php
@@ -45,6 +45,11 @@
         'PUBLICATION_END_PAGE' => 'Page de fin',
         'PUBLICATION_EXAMPLE_AUTHOR' => 'Ex: Victor Hugo',
         'PUBLICATION_EXPORT_PAGES_INFO' => 'S&eacute;lectionnez vos pages pour l\'Ebook en cliquant sur ',
+        'PUBLICATION_FANZINE_LAYOUT' => 'Pliage des feuilles',
+        'PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE' => 'Feuille individuelle (recto)',
+        'PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE_HELP' => '8 pages imprimée sur une même feuille.',
+        'PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO' => 'Folio (recto)',
+        'PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO_HELP' => '2 pages par feuille, pliée au centre.',
         'PUBLICATION_FILTER_PAGES' => 'Filtrer les pages',
         'PUBLICATION_FOR_THE_EBOOK' => 'pour l&apos;Ebook',
         'PUBLICATION_FROM_THE_EBOOK' => 'de l&apos;Ebook',
@@ -64,7 +69,7 @@
         'PUBLICATION_NO_DESC_FOUND' => 'ERREUR : La description n\'a pas &eacute;t&eacute; renseign&eacute;.',
         'PUBLICATION_NO_EBOOK_FOUND' => 'Pas d\'ebook trouv&eacute;.',
         'PUBLICATION_NO_IMAGE_FOUND' => 'ERREUR : Le lien vers l\'image de couverture n\'a pas &eacute;t&eacute; renseign&eacute;.',
-        'PUBLICATION_NO_PAGE_FOUND' => '',
+        'PUBLICATION_NO_PAGE_FOUND' => 'ERREUR : Sélectionne au moins un contenu pour créer une publication.',
         'PUBLICATION_NO_TITLE_FOUND' => 'ERREUR : Le titre n\'a pas &eacute;t&eacute; renseign&eacute;.',
         'PUBLICATION_NOT_IMAGE_FILE' => 'ERREUR : Le lien vers l\'image de couverture n\'est pas une image avec l\'extension .jpg.',
         'PUBLICATION_PAGINATION_POSITION' => 'Emplacement de la numérotation des pages',
diff --git a/lang/publication_pt.inc.php b/lang/publication_pt.inc.php
index c9b0b5d..0948b4e 100644
--- a/lang/publication_pt.inc.php
+++ b/lang/publication_pt.inc.php
@@ -44,6 +44,11 @@
 'PUBLICATION_END_PAGE' => 'Página final',
 'PUBLICATION_EXAMPLE_AUTHOR' => 'Ex: Victor Hugo',
 'PUBLICATION_EXPORT_PAGES_INFO' => 'Selecione suas páginas para o Ebook clicando em',
+'PUBLICATION_FANZINE_LAYOUT' => 'Dobramento de página',
+'PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE' => 'Folha única (apenas frente)',
+'PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE_HELP' => '8 páginas impressas em uma única folha.',
+'PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO' => 'Fólio (apenas frente)',
+'PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO_HELP' => '2 páginas por folha, dobradas juntas.',
 'PUBLICATION_FILTER_PAGES' => 'Filtrar as páginas',
 'PUBLICATION_FOR_THE_EBOOK' => 'para o Ebook',
 'PUBLICATION_FROM_THE_EBOOK' => 'do Ebook',
@@ -59,11 +64,11 @@
 'PUBLICATION_MORE_OPTIONS' => 'Outras opções de personalização',
 'PUBLICATION_NEWSLETTER' => 'Newsletter',
 'PUBLICATION_NEWSLETTER_CREATED' => 'A newsletter foi criada',
-'PUBLICATION_NO_AUTHOR_FOUND' => 'ERRO: O autor não foi preenchido. ',
-'PUBLICATION_NO_DESC_FOUND' => 'ERRO: A descrição não foi preenchida. ',
+'PUBLICATION_NO_AUTHOR_FOUND' => 'ERRO: O autor não foi preenchido.',
+'PUBLICATION_NO_DESC_FOUND' => 'ERRO: A descrição não foi preenchida.',
 'PUBLICATION_NO_EBOOK_FOUND' => 'Nenhum e-book encontrado.',
-'PUBLICATION_NO_IMAGE_FOUND' => 'ERRO: O link para a imagem da capa não foi preenchido. ',
-'PUBLICATION_NO_PAGE_FOUND' => '',
+'PUBLICATION_NO_IMAGE_FOUND' => 'ERRO: O link para a imagem da capa não foi preenchido.',
+'PUBLICATION_NO_PAGE_FOUND' => 'ERRO : Selecione pelo menos uma página para criar uma publicação.',
 'PUBLICATION_NO_TITLE_FOUND' => 'ERRO: O título não foi preenchido. ',
 'PUBLICATION_NOT_IMAGE_FILE' => 'ERRO: O link para a imagem da capa não é uma imagem com a extensão .jpg.',
 'PUBLICATION_PAGINATION_POSITION' => 'Localização da numeração da página',

From 5eb9f1b61fd53c9e4a4dbcafa7c93716e614dddc Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Mon, 6 Sep 2021 11:59:40 +0200
Subject: [PATCH 07/11] Add fanzine layouts icons

---
 actions/publicationlist.php                   |    2 +
 presentation/fanzine-layouts/README.md        |    8 +
 presentation/fanzine-layouts/recto-folio.svg  |   81 ++
 presentation/fanzine-layouts/scene.excalidraw | 1265 +++++++++++++++++
 presentation/fanzine-layouts/single-page.svg  |   94 ++
 presentation/styles/publication.css           |   15 +
 templates/includes/publication.twig           |    1 +
 templates/publicationgenerator.twig           |    9 +-
 8 files changed, 1472 insertions(+), 3 deletions(-)
 create mode 100644 presentation/fanzine-layouts/README.md
 create mode 100644 presentation/fanzine-layouts/recto-folio.svg
 create mode 100644 presentation/fanzine-layouts/scene.excalidraw
 create mode 100644 presentation/fanzine-layouts/single-page.svg

diff --git a/actions/publicationlist.php b/actions/publicationlist.php
index 4605153..e3294f0 100644
--- a/actions/publicationlist.php
+++ b/actions/publicationlist.php
@@ -59,6 +59,8 @@
   return $page;
 }, $wiki->LoadAll($sql));
 
+$this->addCssFile('tools/publication/presentation/styles/publication.css');
+
 echo $wiki->render('@publication/publicationlist.twig', [
   'hasWriteAccess' => $this->HasAccess('write'),
   'hasDeleteAccess' => $this->UserIsAdmin() || $this->UserIsOwner(),
diff --git a/presentation/fanzine-layouts/README.md b/presentation/fanzine-layouts/README.md
new file mode 100644
index 0000000..2f7513c
--- /dev/null
+++ b/presentation/fanzine-layouts/README.md
@@ -0,0 +1,8 @@
+# Fanzine Layouts Icons
+
+They are designed with Excalidraw.
+
+- [Read-only source on Excalidraw][source] ;
+- [Scene source](./scene.excalidraw).
+
+[source]: https://excalidraw.com/#json=5767718061998080,6IjJ8eRA7yHZ6SOafTch9Q
diff --git a/presentation/fanzine-layouts/recto-folio.svg b/presentation/fanzine-layouts/recto-folio.svg
new file mode 100644
index 0000000..77aa91d
--- /dev/null
+++ b/presentation/fanzine-layouts/recto-folio.svg
@@ -0,0 +1,81 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 75.70412627727865 52.40338289700631" width="227.11237883183594" height="157.21014869101893">
+  <g stroke-linecap="round" transform="translate(20.72925320648551 19.99757400228087) rotate(0 6.551755137147666 8.783549608653068)">
+    <path d="M0 0 L13.1 0 L13.1 17.57 L0 17.57" stroke="none" stroke-width="0" fill="#fff"></path>
+    <path d="M0 0 C2.9 0, 5.8 0, 13.1 0 M0 0 C3.43 0, 6.85 0, 13.1 0 M13.1 0 C13.1 4.5, 13.1 9.01, 13.1 17.57 M13.1 0 C13.1 5.89, 13.1 11.78, 13.1 17.57 M13.1 17.57 C9.16 17.57, 5.21 17.57, 0 17.57 M13.1 17.57 C8.84 17.57, 4.57 17.57, 0 17.57 M0 17.57 C0 13.67, 0 9.77, 0 0 M0 17.57 C0 11.46, 0 5.35, 0 0" stroke="#000000" stroke-width="1" fill="none"></path>
+  </g>
+  <g stroke-linecap="round">
+    <g transform="translate(35.41307540278922 23.14540559673719) rotate(0 -8.544814782617436 -4.477643094400065)">
+      <path d="M-2.25 -2.02 C-2.64 -2.4, -2.48 -3.49, -4.58 -4.31 C-6.67 -5.13, -13.13 -6.5, -14.84 -6.94 M-2.25 -2.02 C-2.64 -2.4, -2.48 -3.49, -4.58 -4.31 C-6.67 -5.13, -13.13 -6.5, -14.84 -6.94" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g transform="translate(20.872479850009995 17.128730620213886) rotate(0 0.19300244283147094 1.091860695160932)">
+      <path d="M0 0 C0.06 0.36, 0.32 1.82, 0.39 2.18 M0 0 C0.06 0.36, 0.32 1.82, 0.39 2.18" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g transform="translate(26.094678495870085 23.548387096774192) rotate(0 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">3</text>
+  </g>
+  <g transform="translate(24.981775270063736 10) rotate(0 1.5 3)">
+    <text x="1.5" y="5" font-family="monospace" font-size="4.271067766941762px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">4</text>
+  </g>
+  <g stroke-linecap="round" transform="translate(10 24.139895211675736) rotate(0 6.8114773978572885 9.131743842665287)">
+    <path d="M0 0 L13.62 0 L13.62 18.26 L0 18.26" stroke="none" stroke-width="0" fill="#fff"></path>
+    <path d="M0 0 C4.92 0, 9.84 0, 13.62 0 M0 0 C3.15 0, 6.31 0, 13.62 0 M13.62 0 C13.62 6.17, 13.62 12.34, 13.62 18.26 M13.62 0 C13.62 6.2, 13.62 12.39, 13.62 18.26 M13.62 18.26 C8.44 18.26, 3.26 18.26, 0 18.26 M13.62 18.26 C9.43 18.26, 5.23 18.26, 0 18.26 M0 18.26 C0 13.27, 0 8.28, 0 0 M0 18.26 C0 11.01, 0 3.76, 0 0" stroke="#000000" stroke-width="1" fill="none"></path>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(25.246673086935743 27.661534628995284) rotate(0 -8.295314522530134 -4.683609487564013)">
+      <path d="M-1.75 -2.43 C-2.15 -2.78, -1.99 -3.78, -4.17 -4.53 C-6.35 -5.28, -13.06 -6.53, -14.84 -6.94 M-1.75 -2.43 C-2.15 -2.78, -1.99 -3.78, -4.17 -4.53 C-6.35 -5.28, -13.06 -6.53, -14.84 -6.94" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(10.692458851033962 20.99150359772237) rotate(0 0.2844954415169241 1.5120718768781387)">
+      <path d="M0 0 C0.09 0.5, 0.47 2.52, 0.57 3.02 M0 0 C0.09 0.5, 0.47 2.52, 0.57 3.02" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(14.80435591522496 28.225806451612897) rotate(0 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">1</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(14.497904302321558 14.032258064516128) rotate(0 1.5 3)">
+    <text x="1.5" y="5" font-family="monospace" font-size="4.271067766941762px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">2</text>
+  </g>
+  <g stroke-linecap="round">
+    <g transform="translate(39.12275282214409 29.338953983834003) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M0 0 C1.42 -0.03, 7.12 -0.13, 8.55 -0.16 M0 0 C1.42 -0.03, 7.12 -0.13, 8.55 -0.16" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+    <g transform="translate(39.12275282214409 29.338953983834003) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M-0.08 -4.27 C-0.06 -3.24, -0.04 -2.21, 0 0 M-0.08 -4.27 C-0.05 -2.57, -0.02 -0.87, 0 0" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+    <g transform="translate(39.12275282214409 29.338953983834003) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M0.08 4.27 C0.06 3.24, 0.04 2.21, 0 0 M0.08 4.27 C0.05 2.57, 0.02 0.87, 0 0" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+    <g transform="translate(39.12275282214409 29.338953983834003) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M4.56 1.38 C5.52 1, 6.49 0.63, 8.55 -0.16 M4.56 1.38 C6.15 0.76, 7.73 0.15, 8.55 -0.16" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+    <g transform="translate(39.12275282214409 29.338953983834003) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M4.5 -1.55 C5.48 -1.21, 6.46 -0.88, 8.55 -0.16 M4.5 -1.55 C6.11 -1, 7.72 -0.44, 8.55 -0.16" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round" transform="translate(51.25934147795215 22.204690417963675) rotate(2.4936349325139164 6.893800032205718 9.24210891699709)">
+    <path d="M0 0 L13.79 0 L13.79 18.48 L0 18.48" stroke="none" stroke-width="0" fill="#fff"></path>
+    <path d="M0 0 C3.09 0, 6.17 0, 13.79 0 M0 0 C4.15 0, 8.3 0, 13.79 0 M13.79 0 C13.79 4.96, 13.79 9.92, 13.79 18.48 M13.79 0 C13.79 6.74, 13.79 13.48, 13.79 18.48 M13.79 18.48 C9.75 18.48, 5.71 18.48, 0 18.48 M13.79 18.48 C9.72 18.48, 5.65 18.48, 0 18.48 M0 18.48 C0 14.44, 0 10.4, 0 0 M0 18.48 C0 12.27, 0 6.05, 0 0" stroke="#000000" stroke-width="1" fill="none"></path>
+  </g>
+  <g stroke-linecap="round">
+    <g transform="translate(66.4065935620863 24.080883564052996) rotate(358.01731614998914 -8.355974567093654 -1.662183671597802)">
+      <path d="M-2.68 -0.58 C-2.64 -0.94, -0.34 -2.61, -2.42 -2.74 C-4.5 -2.87, -13.04 -1.58, -15.16 -1.34 M-2.68 -0.58 C-2.64 -0.94, -0.34 -2.61, -2.42 -2.74 C-4.5 -2.87, -13.04 -1.58, -15.16 -1.34" stroke="#343a40" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g transform="translate(66.64437373647274 21.470417548212254) rotate(358.01731614998914 -8.068040750487512 -0.5104484051730935)">
+      <path d="M-2.16 1.72 C-2.11 0.98, 0.29 -2.48, -1.88 -2.74 C-4.05 -3, -12.95 -0.34, -15.16 0.15 M-2.16 1.72 C-2.11 0.98, 0.29 -2.48, -1.88 -2.74 C-4.05 -3, -12.95 -0.34, -15.16 0.15" stroke="#343a40" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g transform="translate(64.02789331363874 39.52943050069739) rotate(358.01731614998914 1.007768358121666 -9.789749764610136)">
+      <path d="M0 0 C0.34 -3.26, 1.68 -16.32, 2.02 -19.58 M0 0 C0.34 -3.26, 1.68 -16.32, 2.02 -19.58" stroke="#343a40" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(56.15501088665974 27.048631403188836) rotate(0 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">1</text>
+  </g>
+</svg>
diff --git a/presentation/fanzine-layouts/scene.excalidraw b/presentation/fanzine-layouts/scene.excalidraw
new file mode 100644
index 0000000..b90e7c4
--- /dev/null
+++ b/presentation/fanzine-layouts/scene.excalidraw
@@ -0,0 +1,1265 @@
+{
+  "type": "excalidraw",
+  "version": 2,
+  "source": "https://excalidraw.com",
+  "elements": [
+    {
+      "id": "ce1n8FRlihB8drowQ6oVx",
+      "type": "rectangle",
+      "x": 1073.1261495273968,
+      "y": 92.93287192932671,
+      "width": 13.103510274295246,
+      "height": 17.567099217306136,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "YVo66wluomAsRYhP1YtTb",
+        "1mIFkfI_TRp9sPnOGmS_T"
+      ],
+      "strokeSharpness": "sharp",
+      "seed": 1250119514,
+      "version": 327,
+      "versionNonce": 500260102,
+      "isDeleted": false,
+      "boundElementIds": null
+    },
+    {
+      "id": "s1N4vddVIeO2fMLszGiZh",
+      "type": "line",
+      "x": 1087.8099717237005,
+      "y": 96.08070352378303,
+      "width": 12.587789789604034,
+      "height": 4.915681553135362,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "YVo66wluomAsRYhP1YtTb",
+        "1mIFkfI_TRp9sPnOGmS_T"
+      ],
+      "strokeSharpness": "round",
+      "seed": 604436826,
+      "version": 379,
+      "versionNonce": 1749245530,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          -2.2509198878154675,
+          -2.019802317832382
+        ],
+        [
+          -4.57692452285098,
+          -4.306165830918591
+        ],
+        [
+          -14.838709677419502,
+          -6.935483870967744
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "l-ckZeZbuKUL2Puf3SvHC",
+      "type": "line",
+      "x": 1073.2693761709213,
+      "y": 90.06402854725972,
+      "width": 0.3860048856629419,
+      "height": 2.183721390321864,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "YVo66wluomAsRYhP1YtTb",
+        "1mIFkfI_TRp9sPnOGmS_T"
+      ],
+      "strokeSharpness": "round",
+      "seed": 777174554,
+      "version": 306,
+      "versionNonce": 921422918,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          0.3860048856629419,
+          2.183721390321864
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "IwABXVbIk9oAil2qJsVs3",
+      "type": "text",
+      "x": 1078.4915748167814,
+      "y": 96.48368502382003,
+      "width": 4,
+      "height": 8,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "1mIFkfI_TRp9sPnOGmS_T"
+      ],
+      "strokeSharpness": "sharp",
+      "seed": 1728521542,
+      "version": 271,
+      "versionNonce": 1471841050,
+      "isDeleted": false,
+      "boundElementIds": [
+        "LmCjPCDuoKJ1ajm2nKS1X"
+      ],
+      "text": "3",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "V9OEI6OLiZOnk4Ih7x4lY",
+      "type": "text",
+      "x": 1077.378671590975,
+      "y": 82.93529792704584,
+      "width": 3,
+      "height": 6,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "1mIFkfI_TRp9sPnOGmS_T"
+      ],
+      "strokeSharpness": "sharp",
+      "seed": 1760655386,
+      "version": 606,
+      "versionNonce": 2037797766,
+      "isDeleted": false,
+      "boundElementIds": [
+        "AH0o4JMdARXR7hRy8bchZ",
+        "LmCjPCDuoKJ1ajm2nKS1X"
+      ],
+      "text": "4",
+      "fontSize": 4.271067766941762,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "top",
+      "baseline": 5
+    },
+    {
+      "id": "kHIwmEYuhXIFebdsAL-m1",
+      "type": "rectangle",
+      "x": 1063.1538461538462,
+      "y": 46.307692307692314,
+      "width": 30.769230769230944,
+      "height": 20.708407871198567,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 1,
+      "opacity": 100,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 15375686,
+      "version": 129,
+      "versionNonce": 1047465946,
+      "isDeleted": false,
+      "boundElementIds": null
+    },
+    {
+      "id": "-ucgSPFDoiEEwRhRb4nxK",
+      "type": "rectangle",
+      "x": 1109.851520572451,
+      "y": 52.07513416815743,
+      "width": 7.978533094812507,
+      "height": 11.638640429338103,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 1141232582,
+      "version": 319,
+      "versionNonce": 1873670854,
+      "isDeleted": false,
+      "boundElementIds": null
+    },
+    {
+      "id": "UuTAKwg5venSv5BMAz3l8",
+      "type": "line",
+      "x": 1063.1538461538462,
+      "y": 55.23076923076923,
+      "width": 29.69230769230785,
+      "height": 0.6153846153846203,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 30,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 2033991878,
+      "version": 81,
+      "versionNonce": 544474266,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          29.69230769230785,
+          0.6153846153846203
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "PB4y8MaDTU-CmvT7lretW",
+      "type": "line",
+      "x": 1070.0554561717352,
+      "y": 46.69409660107333,
+      "width": 0,
+      "height": 19.538461538461533,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 20,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 1995577158,
+      "version": 83,
+      "versionNonce": 1412409862,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          0,
+          19.538461538461533
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "ebgqIQAuauCGYeCazoPn4",
+      "type": "line",
+      "x": 1077.0322003577817,
+      "y": 46.92665474060822,
+      "width": 0,
+      "height": 19.538461538461533,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 20,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 901608026,
+      "version": 121,
+      "versionNonce": 125591898,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          0,
+          19.538461538461533
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "LcikUYfGfCcN2a4fhO1XI",
+      "type": "line",
+      "x": 1084.7066189624331,
+      "y": 46.694096601073355,
+      "width": 0,
+      "height": 19.538461538461533,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 20,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 1369387910,
+      "version": 152,
+      "versionNonce": 100170054,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          0,
+          19.538461538461533
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "-Te9lFwocd-jRRaIY27oQ",
+      "type": "text",
+      "x": 1064.8756708407873,
+      "y": 56.315643013317384,
+      "width": 3.5465116279069893,
+      "height": 7.8811369509044225,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 1129877722,
+      "version": 100,
+      "versionNonce": 1870877402,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "text": "6",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 6.8811369509044225
+    },
+    {
+      "id": "LFvk9Ey34DFde7ffL-jJc",
+      "type": "text",
+      "x": 1071.619856887299,
+      "y": 56.54820115285227,
+      "width": 4,
+      "height": 8,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 1730921370,
+      "version": 140,
+      "versionNonce": 993222598,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "text": "7",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "T4ts7ndoTp7ORjalwiaq-",
+      "type": "text",
+      "x": 1079.2942754919502,
+      "y": 56.315643013317384,
+      "width": 4,
+      "height": 8,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 1439143322,
+      "version": 165,
+      "versionNonce": 1275586458,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "text": "8",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "8crtZ5kXsWpKju9aHFbJw",
+      "type": "text",
+      "x": 1087.2012522361363,
+      "y": 56.54820115285227,
+      "width": 4,
+      "height": 8,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 2086250758,
+      "version": 193,
+      "versionNonce": 1182758662,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "text": "1",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "OscrxmAvNGbBHEdsWQba4",
+      "type": "text",
+      "x": 1112.038461538462,
+      "y": 53.245875571456935,
+      "width": 4,
+      "height": 8,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 1176900998,
+      "version": 229,
+      "versionNonce": 2090591322,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "text": "1",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "kr-yvOobCWmvC6iscCp3o",
+      "type": "text",
+      "x": 1086.5035778175315,
+      "y": 47.24587557145692,
+      "width": 4,
+      "height": 8,
+      "angle": 3.141592653589793,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 1277318810,
+      "version": 257,
+      "versionNonce": 857915462,
+      "isDeleted": false,
+      "boundElementIds": [
+        "JrEI2HZ7HrGiW4YD3c7NH"
+      ],
+      "text": "2",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "aJJuyNOL7HOnnJe4Jq4kG",
+      "type": "text",
+      "x": 1078.8291592128805,
+      "y": 46.780759292387174,
+      "width": 4,
+      "height": 8,
+      "angle": 3.141592653589793,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 1053259782,
+      "version": 274,
+      "versionNonce": 1736387162,
+      "isDeleted": false,
+      "boundElementIds": [
+        "JrEI2HZ7HrGiW4YD3c7NH"
+      ],
+      "text": "3",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "ySw3dNag63ddREEx0oseB",
+      "type": "text",
+      "x": 1071.8524150268338,
+      "y": 46.78075929238715,
+      "width": 4,
+      "height": 8,
+      "angle": 3.141592653589793,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 227570522,
+      "version": 255,
+      "versionNonce": 216395142,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "text": "4",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "Bn7GC38iSz548umK7Pzpv",
+      "type": "text",
+      "x": 1065.1082289803223,
+      "y": 46.78075929238715,
+      "width": 4,
+      "height": 8,
+      "angle": 3.141592653589793,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [],
+      "strokeSharpness": "sharp",
+      "seed": 677807942,
+      "version": 300,
+      "versionNonce": 249435610,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "text": "5",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "E3OoR8IwVr7f0enX_c1-T",
+      "type": "line",
+      "x": 1111.7857781753135,
+      "y": 51.649251910879826,
+      "width": 4.5,
+      "height": 1.124999999999993,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 70,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 591917190,
+      "version": 80,
+      "versionNonce": 1494370970,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          4.5,
+          -1.124999999999993
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "Pux2i_hIwziAjB4_G7l_n",
+      "type": "line",
+      "x": 1110.1607781753135,
+      "y": 51.649251910879826,
+      "width": 4.375,
+      "height": 2.374999999999993,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 70,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 1848153926,
+      "version": 130,
+      "versionNonce": 805356550,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          4.375,
+          -2.374999999999993
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "zOm4UDNA1DYlrpfkbHsuw",
+      "type": "line",
+      "x": 1116.5357781753135,
+      "y": 50.27425191087983,
+      "width": 0.25,
+      "height": 1.5,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 70,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 451977990,
+      "version": 71,
+      "versionNonce": 1617028954,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          0.25,
+          1.5
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "OcjKIJ0KePUdjYQgpbMW1",
+      "type": "line",
+      "x": 1114.7857781753135,
+      "y": 48.89925191087983,
+      "width": 0.125,
+      "height": 1.625,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 70,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 1996129370,
+      "version": 59,
+      "versionNonce": 1016484678,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          0.125,
+          1.625
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "7SRX7zsYZZcxX4Iu3UkGj",
+      "type": "rectangle",
+      "x": 1062.3968963209113,
+      "y": 97.07519313872157,
+      "width": 13.622954795714552,
+      "height": 18.26348768533057,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "atgNuwkA5NSu6HJLHLbGu",
+        "OUBz9yFZCkVZxrbn8gaUK"
+      ],
+      "strokeSharpness": "sharp",
+      "seed": 816925786,
+      "version": 405,
+      "versionNonce": 372767366,
+      "isDeleted": false,
+      "boundElementIds": [
+        "4-L0Mx4WoODXO80McFKrq"
+      ]
+    },
+    {
+      "id": "Q1JeLYUbPkrHVqIIes4by",
+      "type": "line",
+      "x": 1077.643569407847,
+      "y": 100.59683255604112,
+      "width": 13.08679030977872,
+      "height": 4.50374876680746,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [
+        "atgNuwkA5NSu6HJLHLbGu",
+        "OUBz9yFZCkVZxrbn8gaUK"
+      ],
+      "strokeSharpness": "round",
+      "seed": 1338044890,
+      "version": 381,
+      "versionNonce": 88037594,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          -1.7519193676407818,
+          -2.4317351041602846
+        ],
+        [
+          -4.170130620534657,
+          -4.5265019724428175
+        ],
+        [
+          -14.838709677419502,
+          -6.935483870967744
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "8nfce9AgIexgqA6VpuNQD",
+      "type": "line",
+      "x": 1063.0893551719453,
+      "y": 93.92680152476821,
+      "width": 0.5689908830338481,
+      "height": 3.0241437537562774,
+      "angle": 0,
+      "strokeColor": "#000000",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [
+        "atgNuwkA5NSu6HJLHLbGu",
+        "OUBz9yFZCkVZxrbn8gaUK"
+      ],
+      "strokeSharpness": "round",
+      "seed": 699408774,
+      "version": 269,
+      "versionNonce": 1940044230,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          0.5689908830338481,
+          3.0241437537562774
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "kJWsvGd_JP4Fha6iT2RMl",
+      "type": "text",
+      "x": 1067.2012522361363,
+      "y": 101.16110437865873,
+      "width": 4,
+      "height": 8,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [
+        "OUBz9yFZCkVZxrbn8gaUK"
+      ],
+      "strokeSharpness": "sharp",
+      "seed": 1069087834,
+      "version": 385,
+      "versionNonce": 408104346,
+      "isDeleted": false,
+      "boundElementIds": [
+        "LmCjPCDuoKJ1ajm2nKS1X"
+      ],
+      "text": "1",
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "middle",
+      "baseline": 7
+    },
+    {
+      "id": "cAdtAgUT0ImHnQNa-PohT",
+      "type": "text",
+      "x": 1066.8948006232329,
+      "y": 86.96755599156197,
+      "width": 3,
+      "height": 6,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "groupIds": [
+        "OUBz9yFZCkVZxrbn8gaUK"
+      ],
+      "strokeSharpness": "sharp",
+      "seed": 1515842842,
+      "version": 683,
+      "versionNonce": 1804495450,
+      "isDeleted": false,
+      "boundElementIds": [
+        "AH0o4JMdARXR7hRy8bchZ",
+        "LmCjPCDuoKJ1ajm2nKS1X"
+      ],
+      "text": "2",
+      "fontSize": 4.271067766941762,
+      "fontFamily": 3,
+      "textAlign": "center",
+      "verticalAlign": "top",
+      "baseline": 5
+    },
+    {
+      "id": "JrEI2HZ7HrGiW4YD3c7NH",
+      "type": "arrow",
+      "x": 1097.0035201107974,
+      "y": 57.112961588299186,
+      "width": 8.54838709677415,
+      "height": 0.16129032258064058,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 1415304666,
+      "version": 119,
+      "versionNonce": 2131334022,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          8.54838709677415,
+          -0.16129032258064058
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": {
+        "elementId": "aJJuyNOL7HOnnJe4Jq4kG",
+        "focus": 1.6438368344918368,
+        "gap": 14.174360897916813
+      },
+      "endBinding": {
+        "elementId": "kr-yvOobCWmvC6iscCp3o",
+        "focus": -1.4927827158219888,
+        "gap": 15.048329390039953
+      },
+      "startArrowhead": "bar",
+      "endArrowhead": "arrow"
+    },
+    {
+      "id": "gGqrEkkHlsMha8wJozrY_",
+      "type": "arrow",
+      "x": 1091.5196491430554,
+      "y": 102.27425191087984,
+      "width": 8.54838709677415,
+      "height": 0.16129032258064058,
+      "angle": 0,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [],
+      "strokeSharpness": "round",
+      "seed": 1624847046,
+      "version": 144,
+      "versionNonce": 1926680838,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          8.54838709677415,
+          -0.16129032258064058
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": "bar",
+      "endArrowhead": "arrow"
+    },
+    {
+      "id": "45vQlR4yYo72KQcZPHyuL",
+      "type": "rectangle",
+      "x": 1103.6562377988635,
+      "y": 95.13998834500951,
+      "width": 13.787600064411544,
+      "height": 18.484217833994183,
+      "angle": 0.043522139915114444,
+      "strokeColor": "#000000",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "1fPdkJnLmX7Hh1gcdAu0Z",
+        "rBgENgrE06H1Z_d2xPY4u"
+      ],
+      "strokeSharpness": "sharp",
+      "seed": 879801370,
+      "version": 463,
+      "versionNonce": 83615558,
+      "isDeleted": false,
+      "boundElementIds": [
+        "c2k5Ae2g-dA9_t_mFnH3B",
+        "jt5Ti2xog6kGb7uicBDea"
+      ]
+    },
+    {
+      "id": "q_FSdAJiF2QHgkVMnqsGR",
+      "type": "line",
+      "x": 1118.8034898829976,
+      "y": 97.01618149109883,
+      "width": 12.742545592486067,
+      "height": 2.1595036245463404,
+      "angle": 6.2485809459707795,
+      "strokeColor": "#343a40",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "1fPdkJnLmX7Hh1gcdAu0Z",
+        "rBgENgrE06H1Z_d2xPY4u"
+      ],
+      "strokeSharpness": "round",
+      "seed": 463487322,
+      "version": 262,
+      "versionNonce": 1084825626,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          -2.684214429938064,
+          -0.5824318593246348
+        ],
+        [
+          -2.418744730094658,
+          -2.741935483870975
+        ],
+        [
+          -15.161290322580726,
+          -1.344609609164518
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "qy5JYOiinfMRupNYMN2Jg",
+      "type": "line",
+      "x": 1119.041270057384,
+      "y": 94.40571547525809,
+      "width": 13.281684394791274,
+      "height": 4.462974157395768,
+      "angle": 6.2485809459707795,
+      "strokeColor": "#343a40",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "1fPdkJnLmX7Hh1gcdAu0Z",
+        "rBgENgrE06H1Z_d2xPY4u"
+      ],
+      "strokeSharpness": "round",
+      "seed": 470006342,
+      "version": 305,
+      "versionNonce": 1376519814,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          -2.1563076860142134,
+          1.7210386735247936
+        ],
+        [
+          -1.8796059277894523,
+          -2.741935483870975
+        ],
+        [
+          -15.161290322580726,
+          0.1458713238557014
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "id": "jruodBRGnudyzYps2vqaz",
+      "type": "line",
+      "x": 1116.42478963455,
+      "y": 112.46472842774322,
+      "width": 2.0155367162432554,
+      "height": 19.579499529220268,
+      "angle": 6.2485809459707795,
+      "strokeColor": "#343a40",
+      "backgroundColor": "#fff",
+      "fillStyle": "solid",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 100,
+      "groupIds": [
+        "1fPdkJnLmX7Hh1gcdAu0Z",
+        "rBgENgrE06H1Z_d2xPY4u"
+      ],
+      "strokeSharpness": "round",
+      "seed": 1109385798,
+      "version": 200,
+      "versionNonce": 696388826,
+      "isDeleted": false,
+      "boundElementIds": null,
+      "points": [
+        [
+          0,
+          0
+        ],
+        [
+          2.0155367162432554,
+          -19.579499529220268
+        ]
+      ],
+      "lastCommittedPoint": null,
+      "startBinding": null,
+      "endBinding": null,
+      "startArrowhead": null,
+      "endArrowhead": null
+    },
+    {
+      "type": "text",
+      "version": 441,
+      "versionNonce": 823477702,
+      "isDeleted": false,
+      "id": "p_F9PF4MMQO6zseJ3XmX0",
+      "fillStyle": "hachure",
+      "strokeWidth": 1,
+      "strokeStyle": "solid",
+      "roughness": 0,
+      "opacity": 90,
+      "angle": 0,
+      "x": 1108.551907207571,
+      "y": 99.98392933023467,
+      "strokeColor": "#364fc7",
+      "backgroundColor": "transparent",
+      "width": 4,
+      "height": 8,
+      "seed": 1228249882,
+      "groupIds": [
+        "fv8pUffnzLUyWBuQ0cThD",
+        "rBgENgrE06H1Z_d2xPY4u"
+      ],
+      "strokeSharpness": "sharp",
+      "boundElementIds": [
+        "LmCjPCDuoKJ1ajm2nKS1X",
+        "jt5Ti2xog6kGb7uicBDea"
+      ],
+      "fontSize": 6.304909560723536,
+      "fontFamily": 3,
+      "text": "1",
+      "baseline": 7,
+      "textAlign": "center",
+      "verticalAlign": "middle"
+    }
+  ],
+  "appState": {
+    "gridSize": null,
+    "viewBackgroundColor": "#ffffff"
+  }
+}
\ No newline at end of file
diff --git a/presentation/fanzine-layouts/single-page.svg b/presentation/fanzine-layouts/single-page.svg
new file mode 100644
index 0000000..72efa5a
--- /dev/null
+++ b/presentation/fanzine-layouts/single-page.svg
@@ -0,0 +1,94 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 74.67620751341724 40.70840787119857" width="224.02862254025172" height="122.1252236135957">
+  <g stroke-linecap="round" transform="translate(10 10) rotate(0 15.384615384615472 10.354203935599283)">
+    <path d="M1.36 1.18 L30.6 -1.56 L30.52 19.76 L-1.58 21.7" stroke="none" stroke-width="0" fill="#fff"></path>
+    <path d="M-0.41 -0.91 C9.54 -2.15, 20.03 0.38, 30.52 1.49 M0.98 0.13 C11.15 0.03, 23.96 -1.21, 30.98 -0.52 M30.7 -1.1 C30.84 8.37, 29.54 14.07, 30.41 22.2 M30.76 0.08 C30.19 4.73, 30.63 9.4, 30.4 20.58 M31.76 21.95 C23.02 19.68, 12.37 22.83, -1.99 20.44 M31.14 21.45 C22.83 20.49, 17.02 21.46, -0.96 21.13 M-0.68 19.95 C-0.21 14.42, 0.15 13.53, -1.89 -1.15 M0.08 21.69 C0.95 14.77, -1.02 7.16, -0.4 -0.78" stroke="#000000" stroke-width="1" fill="none"></path>
+  </g>
+  <g stroke-linecap="round" transform="translate(56.69767441860472 15.76744186046512) rotate(0 3.9892665474062596 5.819320214669052)">
+    <path d="M0 0 L7.98 0 L7.98 11.64 L0 11.64" stroke="none" stroke-width="0" fill="#fff"></path>
+    <path d="M0 0 C2.48 0, 4.96 0, 7.98 0 M0 0 C2.12 0, 4.24 0, 7.98 0 M7.98 0 C7.98 2.55, 7.98 5.11, 7.98 11.64 M7.98 0 C7.98 2.73, 7.98 5.46, 7.98 11.64 M7.98 11.64 C6.24 11.64, 4.49 11.64, 0 11.64 M7.98 11.64 C5.85 11.64, 3.73 11.64, 0 11.64 M0 11.64 C0 7.55, 0 3.46, 0 0 M0 11.64 C0 8.6, 0 5.55, 0 0" stroke="#000000" stroke-width="1" fill="none"></path>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.3" fill-opacity="0.3" transform="translate(10 18.92307692307692) rotate(0 14.846153846153925 0.30769230769231015)">
+      <path d="M0 0 C4.95 0.1, 24.74 0.51, 29.69 0.62 M0 0 C4.95 0.1, 24.74 0.51, 29.69 0.62" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.2" fill-opacity="0.2" transform="translate(16.90161001788897 10.38640429338102) rotate(0 0 9.769230769230763)">
+      <path d="M0 0 C0 3.26, 0 16.28, 0 19.54 M0 0 C0 3.26, 0 16.28, 0 19.54" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.2" fill-opacity="0.2" transform="translate(23.878354203935487 10.618962432915907) rotate(0 0 9.769230769230763)">
+      <path d="M0 0 C0 3.26, 0 16.28, 0 19.54 M0 0 C0 3.26, 0 16.28, 0 19.54" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.2" fill-opacity="0.2" transform="translate(31.55277280858695 10.386404293381041) rotate(0 0 9.769230769230766)">
+      <path d="M0 0 C0 3.26, 0 16.28, 0 19.54 M0 0 C0 3.26, 0 16.28, 0 19.54" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(11.72182468694109 20.00795070562507) rotate(0 1.773255813953483 3.94056847545221)">
+    <text x="1.7732558139534946" y="6.8811369509044225" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">6</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(18.466010733452777 20.240508845159958) rotate(0 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">7</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(26.140429338104013 20.00795070562507) rotate(0 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">8</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(34.04740608229008 20.240508845159958) rotate(0 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">1</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(58.8846153846157 16.93818326376462) rotate(0 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">1</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(33.34973166368536 10.938183263764607) rotate(180 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">2</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(25.67531305903435 10.47306698469486) rotate(180 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">3</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(18.698568872987607 10.473066984694839) rotate(180 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">4</text>
+  </g>
+  <g stroke-opacity="0.9" fill-opacity="0.9" transform="translate(11.954382826476149 10.473066984694839) rotate(180 2 4)">
+    <text x="2" y="7" font-family="monospace" font-size="6.304909560723536px" fill="#364fc7" text-anchor="middle" style="white-space: pre;" direction="ltr">5</text>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(58.631932021467264 15.341559603187513) rotate(0 2.25 -0.5624999999999964)">
+      <path d="M0 0 C0.75 -0.19, 3.75 -0.94, 4.5 -1.12 M0 0 C0.75 -0.19, 3.75 -0.94, 4.5 -1.12" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(57.006932021467264 15.341559603187513) rotate(0 2.1875 -1.1874999999999964)">
+      <path d="M0 0 C0.73 -0.4, 3.65 -1.98, 4.38 -2.37 M0 0 C0.73 -0.4, 3.65 -1.98, 4.38 -2.37" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(63.381932021467264 13.96655960318752) rotate(0 0.125 0.75)">
+      <path d="M0 0 C0.04 0.25, 0.21 1.25, 0.25 1.5 M0 0 C0.04 0.25, 0.21 1.25, 0.25 1.5" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g stroke-opacity="0.7" fill-opacity="0.7" transform="translate(61.631932021467264 12.59155960318752) rotate(0 0.0625 0.8125)">
+      <path d="M0 0 C0.02 0.27, 0.1 1.35, 0.13 1.63 M0 0 C0.02 0.27, 0.1 1.35, 0.13 1.63" stroke="#000000" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+  <g stroke-linecap="round">
+    <g transform="translate(43.849673956951165 20.805269280606872) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M0 0 C1.42 -0.03, 7.12 -0.13, 8.55 -0.16 M0 0 C1.42 -0.03, 7.12 -0.13, 8.55 -0.16" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+    <g transform="translate(43.849673956951165 20.805269280606872) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M-0.08 -4.27 C-0.06 -3.31, -0.04 -2.35, 0 0 M-0.08 -4.27 C-0.05 -2.73, -0.02 -1.18, 0 0" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+    <g transform="translate(43.849673956951165 20.805269280606872) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M0.08 4.27 C0.06 3.31, 0.04 2.35, 0 0 M0.08 4.27 C0.05 2.73, 0.02 1.18, 0 0" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+    <g transform="translate(43.849673956951165 20.805269280606872) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M4.56 1.38 C5.46 1.03, 6.36 0.68, 8.55 -0.16 M4.56 1.38 C6 0.82, 7.45 0.26, 8.55 -0.16" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+    <g transform="translate(43.849673956951165 20.805269280606872) rotate(0 4.274193548387075 -0.08064516129032029)">
+      <path d="M4.5 -1.55 C5.42 -1.23, 6.33 -0.92, 8.55 -0.16 M4.5 -1.55 C5.97 -1.05, 7.43 -0.54, 8.55 -0.16" stroke="#364fc7" stroke-width="1" fill="none"></path>
+    </g>
+  </g>
+</svg>
diff --git a/presentation/styles/publication.css b/presentation/styles/publication.css
index 13299db..c9a798d 100644
--- a/presentation/styles/publication.css
+++ b/presentation/styles/publication.css
@@ -12,6 +12,10 @@
   margin: 0;
 }
 
+.fanzine-layout.img-icon {
+  height: 2.5em;
+}
+
 .yw-publication__show .img-cover {
   object-fit: cover;
   height: 250px;
@@ -51,6 +55,17 @@
   font-weight: normal;
 }
 
+.export-table-form .radio.pill {
+  border: 1px solid currentColor;
+  border-radius: var(--btn-border-radius);
+  cursor: pointer;
+}
+.export-table-form .radio.pill:has(:checked),
+.export-table-form .radio.pill:focus-within {
+  border-color: var(--link-color);
+  border-width: 3px;
+}
+
 .export-table-form .form-group.checkbox .control-label,
 .export-table-form .form-group.checkbox .control-label + .form-text,
 .export-table-form .form-row .radio-inline {
diff --git a/templates/includes/publication.twig b/templates/includes/publication.twig
index 6528c3d..da0f09a 100644
--- a/templates/includes/publication.twig
+++ b/templates/includes/publication.twig
@@ -18,6 +18,7 @@
             {{ _t('PUBLICATION_EBOOK_ORIENTATION_%s' | format(metas['publication-book']['page-orientation']| upper)) }}
           {% elseif metas['publication-mode'] == 'fanzine' %}
             {{ _t('PUBLICATION_FANZINE_LAYOUT_%s' | format(metas['publication-fanzine']['layout'] | replace({'-': '_'}) | upper)) }}
+            <img src="tools/publication/presentation/fanzine-layouts/{{ metas['publication-fanzine']['layout'] }}.svg" alt="" class="fanzine-layout img-icon">
           {% endif %}
           </small>
         </p>
diff --git a/templates/publicationgenerator.twig b/templates/publicationgenerator.twig
index a257a15..43dc15e 100644
--- a/templates/publicationgenerator.twig
+++ b/templates/publicationgenerator.twig
@@ -279,18 +279,21 @@
           </div>
         </details>
 
-        <details class="publication-options options-fanzine" hidden>
+        <details class="publication-options options-fanzine" hidden open>
           <summary>{{ _t('PUBLICATION_MORE_OPTIONS') }}</summary>
 
           <div class="form-row">
             <label class="d-block" for="fanzine-layout--single-page">{{ _t('PUBLICATION_FANZINE_LAYOUT') }}</label>
 
-            <label class="radio">
+            <label class="radio pill">
+              <img src="tools/publication/presentation/fanzine-layouts/single-page.svg" alt="">
               <input type="radio" id="fanzine-layout--single-page" name="publication-fanzine[layout]" value="single-page" {{ metadatas['publication-fanzine']['layout'] == 'single-page' ? 'checked' }}>
               <span class="control-label">{{ _t('PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE') }}</span>
               <small class="form-text text-muted">{{ _t('PUBLICATION_FANZINE_LAYOUT_SINGLE_PAGE_HELP') }}</small>
             </label>
-            <label class="radio">
+
+            <label class="radio pill">
+              <img src="tools/publication/presentation/fanzine-layouts/recto-folio.svg" alt="">
               <input type="radio" id="fanzine-layout--bottom-sides" name="publication-fanzine[layout]" value="recto-folio" {{ metadatas['publication-fanzine']['layout'] == 'recto-folio' ? 'checked' }}>
               <span class="control-label">{{ _t('PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO') }}</span>
               <small class="form-text text-muted">{{ _t('PUBLICATION_FANZINE_LAYOUT_RECTO_FOLIO_HELP') }}</small>

From 4c03d81334d1044962cc83d2085448c57d0bdf5c Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Mon, 6 Sep 2021 12:45:54 +0200
Subject: [PATCH 08/11] Document config options for `{{editconfig}}`

---
 config.yaml                 | 1 +
 lang/publication_en.inc.php | 7 ++++++-
 lang/publication_fr.inc.php | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config.yaml b/config.yaml
index de97fc2..3c90a36 100644
--- a/config.yaml
+++ b/config.yaml
@@ -38,6 +38,7 @@ parameters:
   #
   # for edit config action
   publication_editable_config_params:
+    - 'htmltopdf_path'
     - 'htmltopdf_service_url'
 
 services:
diff --git a/lang/publication_en.inc.php b/lang/publication_en.inc.php
index a6d10e2..d087b5c 100644
--- a/lang/publication_en.inc.php
+++ b/lang/publication_en.inc.php
@@ -90,5 +90,10 @@
 		'PUBLICATION_NO_GENERATED_PDF_FILE_FOUND' => 'No pdf file was found.<br />Please check access rights on the "cache" folder.',
 		'PUBLICATION_NO_EXECUTABLE_FILE_FOUND_ON_PATH' => 'No executable file found on path',
 		'PUBLICATION_DID_YOU_INSTALL_CHROMIUM_OR_SET_UP_PATH' => 'Did you install Chromium on this server, or setup path to the program or url service (parameters "htmltopdf_path" or "htmltopdf_service_url" in the configuration file) ?',
-		 )
+
+    // edit config
+    'EDIT_CONFIG_HINT_htmltopdf_path' => 'Server custom filepath to Chrome/Chromium.',
+    'EDIT_CONFIG_HINT_htmltopdf_service_url' => 'If you are unable to install Chrome/Chromium on your server, YesWiki URL to delegate the PDF rendering (eg: https://example.org/yeswiki/?MainPage/pdf)',
+    'EDIT_CONFIG_GROUP_PUBLICATION' => 'Publication'
+    )
 );
diff --git a/lang/publication_fr.inc.php b/lang/publication_fr.inc.php
index 8547499..ae9c6a4 100644
--- a/lang/publication_fr.inc.php
+++ b/lang/publication_fr.inc.php
@@ -140,6 +140,8 @@
         'AB_publication_publicationlist_pagenameprefix_label' => 'prefix de page',
 
         // edit config
-        'EDIT_CONFIG_HINT_htmltopdf_service_url' => 'Adresse externe d\'un service chronium (exemple: https://example.org/yeswiki/?PagePrincipale/pdf)',
+        'EDIT_CONFIG_HINT_htmltopdf_path' => 'Chemin d\'accès serveur personnalisé à un Chrome/Chromium.',
+        'EDIT_CONFIG_HINT_htmltopdf_service_url' => 'Si Chrome/Chromium ne peut être installé sur votre machine, adresse d\'un YesWiki à qui déléguer le rendu PDF (exemple: https://example.org/yeswiki/?PagePrincipale/pdf)',
+        'EDIT_CONFIG_GROUP_PUBLICATION' => 'Publication'
     )
 );

From da1ed2edb54e848034192cc82c3ba3e0e883ebf7 Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Mon, 6 Sep 2021 12:46:08 +0200
Subject: [PATCH 09/11] Document new fanzine feature

---
 README.md | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index abc8cc3..c0e0246 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # Extension YesWiki publication
 
-> Extension [YesWiki] qui génère des publications au format PDF à partir d'une sélection de [fiches Bazar][Bazar] et/ou de [pages de contenu][yeswiki-page].
+> Une extension [YesWiki] pour créer des documents imprimables (format PDF) à partir d'une sélection de [fiches Bazar][Bazar] et/ou de [pages de contenu][yeswiki-page].
 
 La mise en page est effectuée par [Paged.js](https://www.pagedjs.org/)
 ([documentation](https://www.pagedjs.org/documentation/)), et la capture PDF par un [navigateur dit "headless"][headless-browser] (par défaut [chromium](#pré-requis)).
 
-Les publications générées sont de type [ebook](#pour-générer-des-ebooks-téléchargeables) ou [newsletter](#pour-générer-des-newsletters).
+Les publications générées sont de type [livres/livrets](#pour-générer-des-livrets-téléchargeables), [fanzines](#pour-générer-des-livrets-téléchargeables) ou [newsletter](#pour-générer-des-newsletters).
 
 
 <table>
@@ -33,12 +33,23 @@ Les publications générées sont de type [ebook](#pour-générer-des-ebooks-té
     <th scope="col">Une page "publication", avec actions de téléchargement et prévisualisation (auteur·ices et admin)</th>
     <th scope="col">Bouton d'export à ajouter (<a href="#action-bazar2publication">action <code>{{bazar2publication}}</code></a>)</th>
   </tr>
+  <tr>
+    <td>
+      <img src="presentation/fanzine-layouts/single-page.svg" alt="">
+    </td>
+    <td>
+    </td>
+  </tr>
+  <tr>
+    <th scope="col">Exemple de pliage de fanzine</th>
+    <th scope="col"></th>
+  </tr>
 </table>
 
 ## Pré-requis technique
 
 Avoir installé [Chromium](https://www.chromium.org/Home) **sur
-le serveur** et connaitre le chemin d'accès vers l'exécutable.
+le serveur**. Éventuellement, connaître le chemin d'accès vers l'exécutable s'il est différent de `/usr/bin/chromium`.
 
 Pour installer Chrome sous Ubuntu/Debian :
 
@@ -59,11 +70,11 @@ L'action `{{publicationgenerator}}` prend en charge les étapes 1, 2 et 3.
 
 Le handler `/pdf` prend en charge l'étape 4.
 
-### Pour générer des ebooks téléchargeables
+### Pour générer des livrets téléchargeables
 
 Utiliser l'action `{{publicationgenerator}}`. Aucun paramètre n'est obligatoire.
 
-Chaque ebook généré sera enregistré sous la forme d'une page sur le wiki. Le nom de cette page sera constitué de la valeur du paramètre `pagenameprefix` suivie du titre de l'ebook.
+Chaque publication est générée sous forme d'une page wiki. Le nom de cette page sera constitué de la valeur du paramètre `pagenameprefix` suivie du titre de l'ebook (par défaut `Ebook`).
 
 On pourra utilement consulter la section [Action `{{publicationgenerator}}`](#action-publicationgenerator) ci-après.
 
@@ -89,6 +100,18 @@ Chaque newsletter générée sera enregistrée sous la forme d'une fiche bazar d
 
 On pourra utilement consulter la section [Action `{{publicationgenerator}}`](#action-publicationgenerator) ci-après.
 
+### Surcharger les styles d'impression par défaut
+
+Des styles d'impression par défaut sont ajoutés pour vous donner le moins de travail possible lors de la création d'une publication.
+Il y a plusieurs mécanismes pour **personnaliser vos styles d'impression** en créant des feuilles de styles (fichiers `.css`) :
+
+| Répertoire                                                  | Noms possibles            | À quoi ça s'applique ?
+| ---                                                         | ---                       | ---
+| `custom/tools/publication/*.css`                            | Peu importe               | Toute publication, peu importe le thème
+| `custom/tools/publication/print-layouts/*.css`              | `fanzine.css`, `book.css` | Seulement les fanzines, ou les livres/livrets, peu importe le thème
+| `themes/NOM_DU_THEME/tools/publication/*.css`               | Peu importe               | Toute publication, pour un thème donné
+| `themes/NOM_DU_THEME/tools/publication/print-layouts/*.css` | `fanzine.css`, `book.css` | Seulement les fanzines, ou les livres/livrets, pour un thème donné
+
 ## Actions YesWiki
 
 L'extension publication ajoute deux actions à votre wiki.

From dadecc6c287787d02593625738f32635a1f46ee6 Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Mon, 6 Sep 2021 12:48:41 +0200
Subject: [PATCH 10/11] Update Chrome library

---
 composer.json |   4 +-
 composer.lock | 242 +++++++++++++++++++++++---------------------------
 2 files changed, 112 insertions(+), 134 deletions(-)

diff --git a/composer.json b/composer.json
index 03668d8..0cfef4d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,8 +8,6 @@
       "test": "exit 0"
     },
     "require": {
-        "chrome-php/chrome": "^0.9.0"
-    },
-    "require-dev": {
+        "chrome-php/chrome": "^1"
     }
 }
diff --git a/composer.lock b/composer.lock
index c41a006..d14db82 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "405a4951f723611aaecfa8aab4bcdeae",
+    "content-hash": "aa5db342722d84a7be0d075facc0a96d",
     "packages": [
         {
             "name": "apix/log",
@@ -64,38 +64,33 @@
         },
         {
             "name": "chrome-php/chrome",
-            "version": "v0.9.0",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/chrome-php/headless-chromium-php.git",
-                "reference": "801c715eb0b7880c916a93db15cae2f09b82eeb8"
+                "url": "https://github.com/chrome-php/chrome.git",
+                "reference": "05e221aa9c65ee69575eaeb714e721fcdc0b2153"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/chrome-php/headless-chromium-php/zipball/801c715eb0b7880c916a93db15cae2f09b82eeb8",
-                "reference": "801c715eb0b7880c916a93db15cae2f09b82eeb8",
+                "url": "https://api.github.com/repos/chrome-php/chrome/zipball/05e221aa9c65ee69575eaeb714e721fcdc0b2153",
+                "reference": "05e221aa9c65ee69575eaeb714e721fcdc0b2153",
                 "shasum": ""
             },
             "require": {
                 "apix/log": "^1.2",
+                "chrome-php/wrench": "^1.0",
                 "evenement/evenement": "^3.0.1",
-                "php": "^7.1.3 || ^8.0",
-                "psr/log": "^1.0",
-                "symfony/filesystem": "^3.3|^4.0|^5.0",
-                "symfony/process": "^3.3|^4.0|^5.0",
-                "wrench/wrench": "^2.0"
+                "php": "^7.3 || ^8.0",
+                "psr/log": "^1.1",
+                "symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
+                "symfony/process": "^4.4 || ^5.0 || ^6.0"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.4.1",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.13 || ^9.5.0",
-                "symfony/var-dumper": "^3.3|^4.0|^5.0"
+                "phpunit/phpunit": "^9.5.9",
+                "symfony/var-dumper": "^4.4 || ^5.0 || ^6.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.9-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "HeadlessChromium\\": "src/"
@@ -103,19 +98,15 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "Fair"
+                "MIT"
             ],
             "authors": [
-                {
-                    "name": "Soufiane Ghzal",
-                    "email": "sghzal@gmail.com"
-                },
                 {
                     "name": "Graham Campbell",
-                    "email": "graham@alt-three.com"
+                    "email": "hello@gjcampbell.co.uk"
                 }
             ],
-            "description": "Instrument headless chrome/chromium instances",
+            "description": "Instrument headless chrome/chromium instances from PHP",
             "keywords": [
                 "browser",
                 "chrome",
@@ -127,10 +118,65 @@
                 "screenshot"
             ],
             "support": {
-                "issues": "https://github.com/chrome-php/headless-chromium-php/issues",
-                "source": "https://github.com/chrome-php/headless-chromium-php/tree/v0.9.0"
+                "issues": "https://github.com/chrome-php/chrome/issues",
+                "source": "https://github.com/chrome-php/chrome/tree/v1.0.1"
             },
-            "time": "2020-12-09T13:14:13+00:00"
+            "time": "2021-09-01T22:17:49+00:00"
+        },
+        {
+            "name": "chrome-php/wrench",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/chrome-php/wrench.git",
+                "reference": "ec3618dd06ec8ecf5842a600a70b6ea99477467f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/chrome-php/wrench/zipball/ec3618dd06ec8ecf5842a600a70b6ea99477467f",
+                "reference": "ec3618dd06ec8ecf5842a600a70b6ea99477467f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-sockets": "*",
+                "php": "^7.3 || ^8.0",
+                "psr/log": "^1.1",
+                "symfony/polyfill-php80": "^1.22"
+            },
+            "conflict": {
+                "wrench/wrench": "*"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "phpunit/phpunit": "^9.5.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Wrench\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk"
+                }
+            ],
+            "description": "A simple PHP WebSocket implementation",
+            "keywords": [
+                "WebSockets",
+                "hybi",
+                "websocket"
+            ],
+            "support": {
+                "issues": "https://github.com/chrome-php/wrench/issues",
+                "source": "https://github.com/chrome-php/wrench/tree/v1.0.0"
+            },
+            "time": "2021-08-15T10:52:04+00:00"
         },
         {
             "name": "evenement/evenement",
@@ -181,16 +227,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -214,7 +260,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -225,27 +271,28 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-03-23T09:12:05+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.2.3",
+            "version": "v5.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "262d033b57c73e8b59cd6e68a45c528318b15038"
+                "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/262d033b57c73e8b59cd6e68a45c528318b15038",
-                "reference": "262d033b57c73e8b59cd6e68a45c528318b15038",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32",
+                "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/polyfill-ctype": "~1.8"
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -273,7 +320,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.2.3"
+                "source": "https://github.com/symfony/filesystem/tree/v5.3.4"
             },
             "funding": [
                 {
@@ -289,20 +336,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:01:46+00:00"
+            "time": "2021-07-21T12:40:44+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.22.1",
+            "version": "v1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
-                "reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
                 "shasum": ""
             },
             "require": {
@@ -314,7 +361,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -352,7 +399,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
             },
             "funding": [
                 {
@@ -368,20 +415,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-02-19T12:13:01+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.22.1",
+            "version": "v1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
-                "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
                 "shasum": ""
             },
             "require": {
@@ -390,7 +437,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.22-dev"
+                    "dev-main": "1.23-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -435,7 +482,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
             },
             "funding": [
                 {
@@ -451,25 +498,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-07T16:49:33+00:00"
+            "time": "2021-07-28T13:41:28+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.2.3",
+            "version": "v5.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f"
+                "reference": "38f26c7d6ed535217ea393e05634cb0b244a1967"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
+                "url": "https://api.github.com/repos/symfony/process/zipball/38f26c7d6ed535217ea393e05634cb0b244a1967",
+                "reference": "38f26c7d6ed535217ea393e05634cb0b244a1967",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.15"
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -497,7 +544,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.2.3"
+                "source": "https://github.com/symfony/process/tree/v5.3.7"
             },
             "funding": [
                 {
@@ -513,74 +560,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-01-27T10:15:41+00:00"
-        },
-        {
-            "name": "wrench/wrench",
-            "version": "v2.0.11",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/varspool/Wrench.git",
-                "reference": "db89efbece7e8b7649e3bdd01f8133d2812163f1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/varspool/Wrench/zipball/db89efbece7e8b7649e3bdd01f8133d2812163f1",
-                "reference": "db89efbece7e8b7649e3bdd01f8133d2812163f1",
-                "shasum": ""
-            },
-            "require": {
-                "ext-sockets": "*",
-                "php": ">=5.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.0",
-                "squizlabs/php_codesniffer": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Wrench": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "WTFPL"
-            ],
-            "authors": [
-                {
-                    "name": "Dominic Scheirlinck",
-                    "email": "dominic@varspool.com",
-                    "homepage": "http://www.somethingemporium.com/"
-                },
-                {
-                    "name": "Simon Samtleben",
-                    "email": "web@lemmingzshadow.net",
-                    "homepage": "http://lemmingzshadow.net/"
-                },
-                {
-                    "name": "Nico Kaiser",
-                    "email": "nico@kaiser.me",
-                    "homepage": "http://siriux.net/"
-                }
-            ],
-            "description": "PHP WebSocket client/server library",
-            "homepage": "http://github.com/varspool/Wrench",
-            "keywords": [
-                "WebSockets",
-                "hybi",
-                "websocket"
-            ],
-            "support": {
-                "issues": "https://github.com/varspool/Wrench/issues",
-                "source": "https://github.com/varspool/Wrench/tree/v2.0.11"
-            },
-            "time": "2020-06-09T13:10:49+00:00"
+            "time": "2021-08-04T21:20:46+00:00"
         }
     ],
     "packages-dev": [],
@@ -591,5 +571,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }

From 1e08b3e5c3100e5f9609bc34fa77c539b4a3ac6c Mon Sep 17 00:00:00 2001
From: Thomas Parisot <oncletom@users.noreply.github.com>
Date: Mon, 6 Sep 2021 15:48:09 +0200
Subject: [PATCH 11/11] Fix `{{ publicationgenerator outputformat="newsletter"
 }}`

---
 actions/publicationgenerator.php | 19 +++++++++----------
 actions/publicationlist.php      |  2 +-
 services/Publication.php         | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/actions/publicationgenerator.php b/actions/publicationgenerator.php
index 64d7714..f55680b 100644
--- a/actions/publicationgenerator.php
+++ b/actions/publicationgenerator.php
@@ -60,7 +60,7 @@
 
 // prefix for created pages
 // Only used when outputformat="ebook"
-$ebookPageNamePrefix = $this->getParameter('pagenameprefix', 'ebook');
+$ebookPageNamePrefix = $this->getParameter('pagenameprefix', 'Ebook');
 
 // include default pages in page listing ?
 $addInstalledPages = $this->getParameter('addinstalledpage');
@@ -248,10 +248,8 @@
                     // $page can be 'SomeTag' or 'SomeTag?parameter=value'
                     // the query string is used to parametrize book creation
                     else {
-                        list($page, $qs) = explode('?', $page);
-                        parse_str($qs, $qs);
-
-                        $output .= '{{include page="' . $page . '" class="'. trim(implode(' ', [$qs['type'], $qs['class']])) .'"}}' . "\n";
+                        $includeCode = $publicationService->getIncludeActionFromPageTag($page);
+                        $output .= $includeCode;
                     }
                 }
 
@@ -269,9 +267,9 @@
             } while (false); // end of ebook specific loop
         } elseif (strcasecmp($outputFormat, 'newsletter') === 0) { // We want to produce a newsletter
             $fiche['id_typeannonce'] = $formId;
-            $fiche['bf_titre'] = $_POST["publication-title"];
-            $fiche['bf_description'] = $_POST["publication-description"];
-            $fiche['bf_author'] = $_POST["publication-author"];
+            $fiche['bf_titre'] = implode(' ', [$outputFormat, $_POST["publication"]["title"]]);
+            $fiche['bf_description'] = $_POST["publication"]["description"];
+            $fiche['bf_author'] = $_POST["publication"]["authors"];
             $fiche['bf_content'] = '';
 
             // Generate the content of the page body
@@ -285,11 +283,12 @@
                 // we assume it is a page tag otherwise
                 // maybe we should also explicitly check it is a valid page tag instead?
                 else {
-                    $fiche['bf_content'] .= $this->Format('{{include page="' . $page . '" class=""}}' . "\n");
+                    $includeCode = $publicationService->getIncludeActionFromPageTag($page);
+                    $fiche['bf_content'] .= $this->Format($includeCode);
                 }
             }
 
-            $acceptedTags = '<h1><h2><h3><h4><h5><h6><hr><hr/><br><br/><span><blockquote><i><u><b><strong><ol><ul><li><small><div><p><a><table><tr><th><td><img><figure><caption><iframe>';
+            $acceptedTags = '<h1><h2><h3><h4><h5><h6><hr><hr/><br><br/><span><blockquote><i><u><b><strong><ol><ul><li><small><div><p><a><table><tr><th><td><img><figure><caption><iframe><style>';
             $fiche['bf_content'] = strip_tags($fiche['bf_content'], $acceptedTags);
             $fiche['antispam'] = 1;
             $fiche = $entryManager->create($formId, $fiche);
diff --git a/actions/publicationlist.php b/actions/publicationlist.php
index e3294f0..d17168d 100644
--- a/actions/publicationlist.php
+++ b/actions/publicationlist.php
@@ -49,7 +49,7 @@
 // recuperation des pages wikis
 $sql = 'SELECT DISTINCT resource FROM '.$this->GetConfigValue('table_prefix').'triples';
 $sql .= ' WHERE property="http://outils-reseaux.org/_vocabulary/metadata"
-			AND value LIKE "%publication-title%" OR value LIKE "%\publication\":{\"title\":%"
+			AND (value LIKE "%publication-title%" OR value LIKE "%\publication\":{\"title\":%")
 			AND resource LIKE "'.$ebookPageNamePrefix.'%" ';
 $sql .= ' ORDER BY resource ASC';
 
diff --git a/services/Publication.php b/services/Publication.php
index 9e85c34..d4df3a0 100644
--- a/services/Publication.php
+++ b/services/Publication.php
@@ -113,6 +113,21 @@ private function convertToNewOptionsFormat($options) {
     return $options;
   }
 
+  /**
+   * @example PageTag?type=publication-end
+   */
+  public function getIncludeActionFromPageTag ($tag) {
+    [$page, $qs] = array_pad(explode('?', $tag), 2, '');
+    parse_str($qs, $params);
+
+    return sprintf(
+      '{{include page="%s" class="%s"%s}}' . "\n",
+      $page,
+      trim(implode(' ', $params)),
+      isset($params['type']) ? ' type="'.$params['type'].'"' : ''
+    );
+  }
+
   public function getOptions(...$args) {
     $options = array_replace_recursive($this->defaultOptions, ...$args);
     return $this->convertToNewOptionsFormat($options);