From eebbeea686d7964be5faf64ad5471e33397322fa Mon Sep 17 00:00:00 2001 From: otrok7 <50595291+otrok7@users.noreply.github.com> Date: Mon, 12 Oct 2026 16:35:23 +0200 Subject: [PATCH] Add CSS to table to prevent resizing font. --- bmlt-meeting-list.php | 2 +- public/class-bread-content-generator.php | 4 ++-- public/class-bread-format-manager.php | 16 ++++++++-------- public/class-bread-meeting-enhancer.php | 12 +++++++----- public/class-bread-public.php | 4 ++-- public/css/mpdfstyletables.css | 1 + readme.txt | 5 ++++- 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/bmlt-meeting-list.php b/bmlt-meeting-list.php index 64f33d3..bde8208 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.7 + * Version: 2.10.8 * Author: bmlt-enabled * Author URI: https://bmlt.app/ * License: GPL-2.0+ diff --git a/public/class-bread-content-generator.php b/public/class-bread-content-generator.php index dbed786..618aefb 100644 --- a/public/class-bread-content-generator.php +++ b/public/class-bread-content-generator.php @@ -458,9 +458,9 @@ private function analyseTemplate(string $template): array * @param array $meeting_value The meeting data. * @param string $template * @param array $analysedTemplate - * @return void + * @return string */ - private function write_single_meeting(array $meeting_value, string $template, array $analysedTemplate) + private function write_single_meeting(array $meeting_value, string $template, array $analysedTemplate): string { $data = $template; $namedValues = array(); diff --git a/public/class-bread-format-manager.php b/public/class-bread-format-manager.php index cb26322..8ce696f 100644 --- a/public/class-bread-format-manager.php +++ b/public/class-bread-format-manager.php @@ -102,12 +102,12 @@ private function getAllFormats(string $lang): array return $this->allFormats[$lang]; } /** - * ULookup the format having a particular field having a particular value. Null if none found. + * Lookup the format having a particular field having a particular value. Null if none found. * * @param string $lang the language of the formats being searched. * @param string $field * @param string $id - * @return array|null + * @return array|null: the format having the specified field value, or null if none found. */ private function getFormatFromField(string $lang, string $field, string $id): array|null { @@ -128,7 +128,7 @@ private function getFormatFromField(string $lang, string $field, string $id): ar * @param array $formats * @param string $id * @param string $field - * @return array|null + * @return array|null the format having the specified field value, or null if none found. */ private function searchField(array $formats, string $id, string $field): array|null { @@ -195,9 +195,9 @@ public function getHashedFormats(string $lang): array * @param boolean $isAll All formats or only used. * @param string $lineHeight * @param string $fontSize - * @return void + * @return string */ - public function write_detailed_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize) + public function write_detailed_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize): string { $formats = $isAll ? $this->allFormats[$lang] : $this->getFormatsUsed($lang); if (empty($formats)) { @@ -218,9 +218,9 @@ public function write_detailed_formats(string $lang, bool $isAll, string $lineHe * @param boolean $isAll All formats or only used. * @param string $lineHeight * @param string $fontSize - * @return void + * @return string the HTML table of formats. */ - public function write_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize, bool $isTwoPerRow = true) + public function write_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize, bool $isTwoPerRow = true): string { $formats = $isAll ? $this->getAllFormats($lang) : $this->getFormatsUsed($lang); if (empty($formats)) { @@ -246,7 +246,7 @@ public function write_formats(string $lang, bool $isAll, string $lineHeight, str $data .= ""; return $data; } - public function getWheelchairFormat($lang) + public function getWheelchairFormat(string $lang): array { if (is_array($this->wheelchairFormat) && empty($this->wheelchairFormat)) { $this->wheelchairFormat = $this->getFormatFromField($lang, 'world_id', 'WCHR'); diff --git a/public/class-bread-meeting-enhancer.php b/public/class-bread-meeting-enhancer.php index 15cfb6a..7190b4a 100644 --- a/public/class-bread-meeting-enhancer.php +++ b/public/class-bread-meeting-enhancer.php @@ -7,7 +7,7 @@ class Bread_Meeting_Enhancer private Bread $bread; private array $options; private array $areas; - function __construct($bread, $areas) + function __construct(Bread $bread, array $areas) { $this->bread = $bread; $this->options = $bread->getOptions(); @@ -18,9 +18,11 @@ function __construct($bread, $areas) * * @param array $meeting_value the raw meeting values, as returned from the BMLT root server. * @param string $lang The language used when generating format descriptions, etc. - * @return void + * @param Bread_FormatsManager $formatsManager The formats manager, used to look up format information. + * @param boolean $formatStartTime Whether to format the start time and duration fields. + * @return array the enhanced meeting values. */ - public function enhance_meeting(&$meeting_value, $lang, $formatsManager, $formatStartTime = true) + public function enhance_meeting(&$meeting_value, string $lang, Bread_FormatsManager $formatsManager, bool $formatStartTime = true): array { if ($formatStartTime) { $duration = explode(':', $meeting_value['duration_time']); @@ -92,7 +94,7 @@ public function enhance_meeting(&$meeting_value, $lang, $formatsManager, $format // Extensions. return apply_filters("Bread_Enrich_Meeting_Data", $meeting_value, $formatsManager->getHashedFormats($lang)); } - private function noon($time) + private function noon(string $time): string { if ($time == '12:00PM' || $time == '12:00 PM') { return 'NOON'; @@ -111,7 +113,7 @@ private function get_area_name(array $meeting_value): string return ''; } - private function toPersianNum($number) + private function toPersianNum(string $number): string { $number = str_replace("1", "۱", $number); $number = str_replace("2", "۲", $number); diff --git a/public/class-bread-public.php b/public/class-bread-public.php index 91135e4..9b0ccac 100644 --- a/public/class-bread-public.php +++ b/public/class-bread-public.php @@ -403,7 +403,7 @@ private function construct_init_options(string $default_font): array return $mpdf_init_options; } - private function drawLinesSeperatingColumns($format, $default_font) + private function drawLinesSeperatingColumns(string $format, string $default_font) { $html = ''; if ($this->options['page_fold'] == 'tri') { @@ -600,7 +600,7 @@ private function reorder_booklet_pages() ]; $mpdfOptions = $this->addFontOptions($mpdfOptions); $mpdftmp = new mPDF($mpdfOptions); - $this->mpdf->shrink_tables_to_fit = 1; + $mpdftmp->shrink_tables_to_fit = 1.01; $np = $mpdftmp->SetSourceFile($FilePath); $ow = $mpdftmp->w; $oh = $mpdftmp->h; diff --git a/public/css/mpdfstyletables.css b/public/css/mpdfstyletables.css index fd7028d..437dafe 100644 --- a/public/css/mpdfstyletables.css +++ b/public/css/mpdfstyletables.css @@ -49,6 +49,7 @@ div { } table { border-collapse: collapse; + overflow: wrap; /*font-family: arialnarrow;*/ /* font-size: 7pt; */ diff --git a/readme.txt b/readme.txt index ceeb460..a007535 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ Tags: meeting list, bmlt, narcotics anonymous, na Requires PHP: 8.1 Requires at least: 6.2 Tested up to: 7.1 -Stable tag: 2.10.7 +Stable tag: 2.10.8 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -55,6 +55,9 @@ Follow all these steps, keep in mind that once you start using bread, it's not g == Changelog == += 2.10.8 = +* Never autoshrink table font-size. + = 2.10.7 = * Allow fields added through extenstions to be used as groupings