Skip to content

Update AbstractParameter.php #959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbtronics merged 5 commits into from
Jul 5, 2025
Merged

Update AbstractParameter.php #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
186e0c8
Update AbstractParameter.php
d-buchmann Jul 1, 2025
36c7e5e
Only escape the percentage sign, so that you can still use latex for …
jbtronics Jul 2, 2025
02409f4
Only escape previously unescaped percentage signs
d-buchmann Jul 3, 2025
8d410c8
simplify regex
d-buchmann Jul 3, 2025
39b0e85
Render the percentage sign correctly in units in the frontend.
jbtronics Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion assets/controllers/pages/latex_preview_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ export default class extends Controller {
{
let value = "";
if (this.unitValue) {
value = "\\mathrm{" + this.inputTarget.value + "}";
//Escape percentage signs
value = this.inputTarget.value.replace(/%/g, '\\%');

value = "\\mathrm{" + value + "}";
} else {
value = this.inputTarget.value;
}
Expand Down
4 changes: 3 additions & 1 deletion assets/controllers/pages/parameters_autocomplete_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ export default class extends Controller
tmp += '<span>' + katex.renderToString(data.symbol) + '</span>'
}
if (data.unit) {
tmp += '<span class="ms-2">' + katex.renderToString('[' + data.unit + ']') + '</span>'
let unit = data.unit.replace(/%/g, '\\%');
unit = "\\mathrm{" + unit + "}";
tmp += '<span class="ms-2">' + katex.renderToString('[' + unit + ']') + '</span>'
}


Expand Down
15 changes: 9 additions & 6 deletions src/Entity/Parameters/AbstractParameter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,19 +217,19 @@ public function getFormattedValue(bool $latex_formatted = false): string

$str = '';
$bracket_opened = false;
if ($this->value_typical) {
if ($this->value_typical !== null) {
$str .= $this->getValueTypicalWithUnit($latex_formatted);
if ($this->value_min || $this->value_max) {
$bracket_opened = true;
$str .= ' (';
}
}

if ($this->value_max && $this->value_min) {
if ($this->value_max !== null && $this->value_min !== null) {
$str .= $this->getValueMinWithUnit($latex_formatted).' ... '.$this->getValueMaxWithUnit($latex_formatted);
} elseif ($this->value_max) {
} elseif ($this->value_max !== null) {
$str .= 'max. '.$this->getValueMaxWithUnit($latex_formatted);
} elseif ($this->value_min) {
} elseif ($this->value_min !== null) {
$str .= 'min. '.$this->getValueMinWithUnit($latex_formatted);
}

Expand Down Expand Up @@ -449,15 +449,18 @@ protected function formatWithUnit(float $value, string $format = '%g', bool $wit
if (!$with_latex) {
$unit = $this->unit;
} else {
$unit = '$\mathrm{'.$this->unit.'}$';
//Escape the percentage sign for convenience (as latex uses it as comment and it is often used in units)
$escaped = preg_replace('/\\\\?%/', "\\\\%", $this->unit);

$unit = '$\mathrm{'.$escaped.'}$';
}

return $str.' '.$unit;
}

return $str;
}

/**
* Returns the class of the element that is allowed to be associated with this attachment.
* @return string
Expand Down
Loading