diff --git a/admin/tinymce/front_page_button/plugin.min.js b/admin/tinymce/front_page_button/plugin.min.js
index ae6ee072..55cf33b3 100644
--- a/admin/tinymce/front_page_button/plugin.min.js
+++ b/admin/tinymce/front_page_button/plugin.min.js
@@ -33,11 +33,17 @@
text: 'Format Code Legend',
menu: [
{
- text: 'Used Format Codes - Abbreviated - Same language as weekdays text',
+ text: 'Used Format Codes - Abbreviated - Same language as weekdays text/ Two Formats per Row',
onclick: function () {
editor.insertContent('
Meeting Format Legend
[format_codes_used_basic]');
}
},
+ {
+ text: 'Used Format Codes - Abbreviated - Same language as weekdays text/ Single Format per Row',
+ onclick: function () {
+ editor.insertContent('
Meeting Format Legend
[format_codes_used_basic_large]');
+ }
+ },
{
text: 'Used Format Codes - Detailed - Same language as weekdays text',
onclick: function () {
@@ -51,11 +57,17 @@
}
},
{
- text: 'All Format Codes - Detailed - Same language as weekdays text',
+ text: 'All Format Codes - Detailed - Same language as weekdays text/ Two Formats per Row',
onclick: function () {
editor.insertContent('
Meeting Format Legend
[format_codes_all_detailed]
');
}
},
+ {
+ text: 'All Format Codes - Abbreviated - Same language as weekdays text/ Single Format per Row',
+ onclick: function () {
+ editor.insertContent('
Meeting Format Legend
[format_codes_used_basic_large]');
+ }
+ },
{
text: 'Format Table in other languages',
onclick: function() {alert("To insert a format table in another language, simply add _{code} to the shortcode, where code is the standard 2-letter abbreviation for the language. Eg, use '_es' to get spanish")}
diff --git a/bmlt-meeting-list.php b/bmlt-meeting-list.php
index 5d46bc7c..bee09967 100644
--- a/bmlt-meeting-list.php
+++ b/bmlt-meeting-list.php
@@ -11,7 +11,7 @@
* Plugin Name: Bread
* Plugin URI: https://bmlt.app
* Description: Maintains and generates PDF Meeting Lists from BMLT.
- * Version: 2.10.4
+ * Version: 2.10.5
* Author: bmlt-enabled
* Author URI: https://bmlt.app/
* License: GPL-2.0+
@@ -30,7 +30,7 @@
* Start at version 2.8.0 and use SemVer - https://semver.org
* Rename this for your plugin and update it as you release new versions.
*/
-define('BREAD_VERSION', '2.10.4');
+define('BREAD_VERSION', '2.10.5');
/**
* The code that runs during plugin activation.
diff --git a/includes/class-bread.php b/includes/class-bread.php
index 73cdbdc4..5de26b1c 100644
--- a/includes/class-bread.php
+++ b/includes/class-bread.php
@@ -696,6 +696,7 @@ private function fillUnsetOptionsInner()
$this->fillUnsetOption('page_fold', 'quad');
$this->fillUnsetOption('meeting_sort', 'day');
$this->fillUnsetStringOption('booklet_pages', false);
+ $this->fillUnsetOption('booklet_columns', 1);
$this->fillUnsetStringOption('borough_suffix', 'Borough');
$this->fillUnsetStringOption('county_suffix', 'County');
$this->fillUnsetStringOption('neighborhood_suffix', 'Neighborhood');
@@ -721,6 +722,11 @@ private function fillUnsetOptionsInner()
$this->fillUnsetOption('include_additional_list', '0');
$this->fillUnsetOption('additional_list_format_key', '');
$this->fillUnsetOption('additional_list_sort_order', 'name');
+ if ($this->options['include_protection']) {
+ $this->fillUnsetStringOption('protection_password', '');
+ } else {
+ $this->options['protection_password'] = '';
+ }
$this->fillUnsetStringOption('protection_password', '');
$this->fillUnsetStringOption('custom_query', '');
$this->fillUnsetStringOption('additional_list_custom_query', '');
diff --git a/public/class-bread-content-generator.php b/public/class-bread-content-generator.php
index 46a1d083..5dcda68b 100644
--- a/public/class-bread-content-generator.php
+++ b/public/class-bread-content-generator.php
@@ -189,6 +189,9 @@ public function generate(int $num_columns): void
$this->mpdf->SetColumns($num_columns, '', $this->options['column_gap']);
if ($this->options['page_fold'] == 'half' || $this->options['page_fold'] == 'full') {
$this->write_front_page();
+ if ($this->options['booklet_columns'] > 1) {
+ $this->mpdf->SetColumns(intval($this->options['booklet_columns']), '', $this->options['column_gap']);
+ }
}
$this->mpdf->WriteHTML('td{font-size: ' . $this->options['content_font_size'] . "pt;line-height:" . $this->options['content_line_height'] . ';background-color:#ffffff00;}', 1);
$this->mpdf->SetDefaultBodyCSS('font-size', $this->options['content_font_size'] . 'pt');
@@ -364,9 +367,6 @@ private function getDeepCopy($m)
private function writeMeetings(string $template, Bread_Meetingslist_Structure $meetingslistStructure): void
{
$template = wpautop(stripslashes($template));
- // TODO: figure out why this is necessary
- //$template = preg_replace('/[[:^print:]]/', ' ', $template);
-
$template = str_replace(" ", " ", $template);
$analysedTemplate = $this->analyseTemplate($template);
@@ -411,7 +411,11 @@ private function writeMeetings(string $template, Bread_Meetingslist_Structure $m
private function writeBreak(Mpdf $mpdf)
{
if ($this->options['page_fold'] === 'half' || $this->options['page_fold'] === 'full') {
- $mpdf->WriteHTML("");
+ if ($this->options['booklet_columns'] > 1) {
+ $mpdf->WriteHTML("");
+ } else {
+ $mpdf->WriteHTML("");
+ }
} else {
$mpdf->WriteHTML("");
}
@@ -535,14 +539,16 @@ private function replace_format_shortcodes(&$data, $page_name)
{
$lang = $this->options['weekday_language'];
$this->shortcode_formats('[format_codes_used_basic]', false, $lang, false, $page_name, $data);
+ $this->shortcode_formats('[format_codes_used_basic_large]', false, $lang, false, $page_name, $data, true);
$this->shortcode_formats('[format_codes_used_detailed]', true, $lang, false, $page_name, $data);
$this->shortcode_formats('[format_codes_used_basic_es]', false, 'es', true, $page_name, $data);
$this->shortcode_formats('[format_codes_used_detailed_es]', true, 'es', true, $page_name, $data);
$this->shortcode_formats('[format_codes_used_basic_fr]', false, 'fr', true, $page_name, $data);
$this->shortcode_formats('[format_codes_all_basic]', false, $lang, true, $page_name, $data);
+ $this->shortcode_formats('[format_codes_all_basic_large]', false, $lang, true, $page_name, $data, true);
$this->shortcode_formats('[format_codes_all_detailed]', true, $lang, true, $page_name, $data);
}
- private function shortcode_formats($shortcode, $detailed, $lang, $isAll, $page, &$str)
+ private function shortcode_formats($shortcode, $detailed, $lang, $isAll, $page, &$str, $large = false)
{
$pos = strpos($str, $shortcode);
if ($pos == false) {
@@ -552,7 +558,7 @@ private function shortcode_formats($shortcode, $detailed, $lang, $isAll, $page,
if ($detailed) {
$value = $this->formatsManager->write_detailed_formats($lang, $isAll, $this->options[$page . '_line_height'], $this->options[$page . '_font_size'] . "pt");
} else {
- $value = $this->formatsManager->write_formats($lang, $isAll, $this->options[$page . '_line_height'], $this->options[$page . '_font_size'] . "pt");
+ $value = $this->formatsManager->write_formats($lang, $isAll, $this->options[$page . '_line_height'], $this->options[$page . '_font_size'] . "pt", !$large);
}
$str = substr($str, 0, $pos) . $value . substr($str, $pos + strlen($shortcode));
}
diff --git a/public/class-bread-format-manager.php b/public/class-bread-format-manager.php
index fa7e9d13..cb263221 100644
--- a/public/class-bread-format-manager.php
+++ b/public/class-bread-format-manager.php
@@ -220,7 +220,7 @@ public function write_detailed_formats(string $lang, bool $isAll, string $lineHe
* @param string $fontSize
* @return void
*/
- public function write_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize)
+ public function write_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize, bool $isTwoPerRow = true)
{
$formats = $isAll ? $this->getAllFormats($lang) : $this->getFormatsUsed($lang);
if (empty($formats)) {
@@ -232,12 +232,14 @@ public function write_formats(string $lang, bool $isAll, string $lineHeight, str
$data .= "