Skip to content

Allow users to control the font used in diffs #1566

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
cpeel merged 1 commit into from
Mar 6, 2026
Merged

Allow users to control the font used in diffs #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pinc/DifferenceEngineWrapperTable.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class DifferenceEngineWrapperTable extends DifferenceEngineWrapper
/**
* Override default css for DP customizations
*/
function get_DifferenceEngine_css_data()
function get_DifferenceEngine_css_data($font_family)
{
return "
.diff-otitle,
Expand All @@ -70,7 +70,7 @@ function get_DifferenceEngine_css_data()
.diff-addedline,
.diff-deletedline,
.diff-context {
font-family: DP Sans Mono;
font-family: $font_family, monospace;
}
/* Adjust padding to prevent descenders from being chopped off. Task 1936 */
.diff-deletedline .diffchange,
Expand Down
27 changes: 24 additions & 3 deletions tools/project_manager/diff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
$only_nonempty_diffs = @$_GET['only_nonempty_diffs'] === 'on';
$bb_diffs = (@$_GET['bb_diffs'] === 'on' and user_can_mentor_in_any_round());

$user_diff_font = Settings::get_Settings(User::current_username())->get_value("diff_font", "DP Sans Mono");
$diff_fonts = array_diff(array_values(get_available_proofreading_font_faces()), ['']);
$diff_font = get_enumerated_param($_GET, "diff_font", $user_diff_font, $diff_fonts);
if ($diff_font != $user_diff_font) {
Settings::get_Settings(User::current_username())->set_value("diff_font", $diff_font);
}

$project = new Project($projectid);
$state = $project->state;
Expand Down Expand Up @@ -92,7 +98,7 @@
$image_url = "$code_url/tools/page_browser.php?project=$projectid&imagefile=$image";
$image_link = sprintf($link_text, new_window_link($image_url, $image));
$extra_args = [
"css_data" => get_DifferenceEngine_css_data(),
"css_data" => get_DifferenceEngine_css_data($diff_font),
"js_data" => "
function copyToClip(textstring) {
navigator.clipboard.writeText(textstring).catch(function () {alert('Unable to copy!');});
Expand All @@ -113,7 +119,8 @@ function copyToClip(textstring) {
$L_user,
$format,
$only_nonempty_diffs,
$bb_diffs
$bb_diffs,
$diff_font
);
echo $navigation_text;

Expand Down Expand Up @@ -183,8 +190,11 @@ function get_navigation(
$L_user,
$format,
$only_nonempty_diffs,
$bb_diffs
$bb_diffs,
$diff_font
) {
global $diff_fonts;

$navigation_text = "";
$jump_to_js = "this.form.image.value=this.form.jumpto[this.form.jumpto.selectedIndex].value; this.form.submit();";

Expand Down Expand Up @@ -273,6 +283,17 @@ function get_navigation(

$navigation_text .= "\n<input type='checkbox' name='only_nonempty_diffs' $checked_attribute id='only_nonempty_diffs' onclick='this.form.submit()'>\n";
$navigation_text .= "\n<label for='only_nonempty_diffs'>" . html_safe(_('Skip empty diffs')) . "</label>\n";

$navigation_text .= "&nbsp;&middot;&nbsp;";

$navigation_text .= "\n<label for='diff_font'>" . html_safe(_('Font')) . ": </label>\n";
$navigation_text .= "\n<select name='diff_font' id='diff_font' onchange='this.form.submit()'>\n";
foreach ($diff_fonts as $font_family) {
$selected = $font_family == $diff_font ? "selected" : "";
$navigation_text .= "\n<option value='" . attr_safe($font_family) . "' $selected>" . html_safe($font_family) . "</option>";
}
$navigation_text .= "\n</select>";

$navigation_text .= "\n</form>\n";

return $navigation_text;
Expand Down