Skip to content
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

Hodie et Crastina option for bookmarking purpose #4193

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Hodie et Crastina option for bookmarking purpose #4193

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 web/cgi-bin/horas/horasscripts.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ sub psalm : ScriptFunc {

my $output = "!$title";
$output .= " [" . ($column == 1 ? ++$psalmnum1 : ++$psalmnum2) . "]"
unless 230 < $psnum && $psnum < 234; # add psalm counter
$output .= "\n!$source" if $source; # add source
unless 230 < $psnum && $psnum < 234; # add psalm counter
$output .= "\n!$source" if $source; # add source
$output .= "\n" . join("\n", @lines) . "\n";
$output .= "\&Gloria\n" unless $psnum == 210 || $nogloria;
$output =~ s/\$ant/Ant. $antline/g if $psnum == 94;
Expand Down
3 changes: 2 additions & 1 deletion web/cgi-bin/horas/officium.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ package main;

if ($officium eq 'Pofficium.pl') {
our $date1 = strictparam('date1');
if (!$date1) { $date1 = gettoday(); }
if (!$date1 || $date1 eq 'hodie') { $date1 = gettoday(); }
if ($date1 eq 'crastina') { $date1 = prevnext(gettoday(), 1); }
if ($command =~ /next/i) { $date1 = prevnext($date1, 1); $command = ''; }
if ($command =~ /prev/i) { $date1 = prevnext($date1, -1); $command = ''; }
}
Expand Down
2 changes: 1 addition & 1 deletion web/cgi-bin/horas/webdia.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ sub setfont {
my $size = ($istr =~ /^\.*?([0-9\-\+]+)/i) ? $1 : 0;
my $color = ($istr =~ /([a-z]+)\s*$/i) ? $1 : '';
if ($istr =~ /(\#[0-9a-f]+)\s*$/i || $istr =~ /([a-z]+)\s*$/i) { $color = $1; }
$color = '' if $color eq 'italic'; # italic is not a color
$color = '' if $color eq 'italic'; # italic is not a color
my $font = "<FONT ";
if ($size) { $font .= "SIZE='$size' "; }
if ($color && $color !~ /black/i) { $font .= "COLOR=\"$color\""; } # black not explictly for dark mode
Expand Down