Merge pull request #4193 from FAJ-Munich/master

Hodie et Crastina option for bookmarking purpose
DivinumOfficium · Nov 28, 2024 · 94f46c4 · 94f46c4
2 parents c5e7308 + db99fa0
commit 94f46c4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/web/cgi-bin/horas/horasscripts.pl b/web/cgi-bin/horas/horasscripts.pl
@@ -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;

diff --git a/web/cgi-bin/horas/officium.pl b/web/cgi-bin/horas/officium.pl
@@ -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 = ''; }
 }

diff --git a/web/cgi-bin/horas/webdia.pl b/web/cgi-bin/horas/webdia.pl
@@ -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