Skip to content

Commit

Permalink
Merge pull request #4251 from igor-primo/master
Browse files Browse the repository at this point in the history
Conform to new Perl heredoc spacing controls
  • Loading branch information
APMarcello3 authored Jan 12, 2025
2 parents 7cdfd8d + 1b45318 commit 31946d1
Show file tree
Hide file tree
Showing 26 changed files with 103 additions and 103 deletions.
2 changes: 1 addition & 1 deletion admin/divinum-get.pl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

my $help;

my $USAGE = <<USAGE ;
my $USAGE = <<USAGE;
Establish divinumofficium web results for a given hour and a range of dates.
Usage:
divinum-get --prayer=PRAYER --version=VERSION [option..]
Expand Down
2 changes: 1 addition & 1 deletion admin/divinum-replay.pl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
);
my $filters = join(' ', @filters);

my $USAGE = <<USAGE ;
my $USAGE = <<USAGE;
Run divinumofficium regression tests against a current version.
Usage: divinum-replay [options] FILE...
Expand Down
14 changes: 7 additions & 7 deletions epub/Eofficium.pl
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ package horas;
#*** print pages (setup, hora=pray, mainpage)
#generate HTML
htmlHead($title, 2);
print << "PrintTag";
print <<"PrintTag";
<BODY VLINK="black" LINK="black" STYLE="font-family:'Gentium Book Basic'; font-size:87%; line-height:130%;">
PrintTag

Expand All @@ -255,7 +255,7 @@ package horas;

horas($command);

print << "PrintTag";
print <<"PrintTag";
PrintTag

} else { #mainpage
Expand All @@ -271,7 +271,7 @@ package horas;
#common widgets for main and hora
if ($pmode =~ /(main|hora)/i) {
if ($votive ne 'C9') {
print << "PrintTag";
print <<"PrintTag";
<P ALIGN="center">
<A HREF="$date1-1-Matutinum.html"><FONT COLOR="$hcolor[1]">$horas[1]</FONT></A>
&nbsp;&nbsp;
Expand All @@ -291,7 +291,7 @@ package horas;
</P>
PrintTag
} else {
print << "PrintTag";
print <<"PrintTag";
<P ALIGN="center">
<A HREF="$date1-1-Matutinum.html"><FONT COLOR="$hcolor[1]">$horas[1]</FONT></A>
&nbsp;&nbsp;
Expand All @@ -310,7 +310,7 @@ package horas;

$command =~ s/(pray|setup)//ig;

print << "PrintTag";
print <<"PrintTag";
</BODY></HTML>
PrintTag

Expand All @@ -321,7 +321,7 @@ sub headline {
my $h = ($hora =~ /(Matutinum|Laudes|Prima|Tertia|Sexta|Nona|Vespera|Completorium)/i) ? $hora : '';
my $daten = prevnext($date1, 1);
my $datep = prevnext($date1, -1);
print << "PrintTag";
print <<"PrintTag";
<P ALIGN="center"><FONT COLOR="$daycolor">$headline<BR></FONT>
$comment<BR><BR>
<SPAN STYLE="font-size:113%; color:maroon;">$h</SPAN>&nbsp;&nbsp;&nbsp;
Expand Down Expand Up @@ -368,6 +368,6 @@ sub prevnext {
#*** Javascript functions
# the sub is called from htmlhead
sub horasjs {
print << "PrintTag";
print <<"PrintTag";
PrintTag
}
2 changes: 1 addition & 1 deletion epub/Ewebdia.pl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sub htmlHead {
my $flag = shift;
if (!$title) { $title = ' '; }

print << "PrintTag";
print <<"PrintTag";
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<HTML><HEAD>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Expand Down
12 changes: 6 additions & 6 deletions obsolete/horas/Ckalendar.pl
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ package horas;

#*** generate HTML
htmlHead($title, 2);
print << "PrintTag";
print <<"PrintTag";
<BODY VLINK=$visitedlink LINK=$link BACKGROUND="$htmlurl/horasbg.jpg" >
<FORM ACTION="Ckalendar.pl" METHOD=post TARGET=_self>
<INPUT TYPE=HIDDEN NAME=setup VALUE="$setupsave">
Expand Down Expand Up @@ -160,7 +160,7 @@ package horas;
print "<A HREF=# onclick=\"setkm($i)\">$mn</A>\n";
if ($i < 12) { print "&nbsp;&nbsp;&nbsp;\n" }
}
print << "PrintTag";
print <<"PrintTag";
<P ALIGN=CENTER>
<TABLE BORDER=$border WIDTH=90% CELLPADDING=3>
<TR><TH>Dies</TH><TH>de Tempore</TH><TH>Sanctorum</TH><TH>d.h.</TH><TR>
Expand Down Expand Up @@ -276,15 +276,15 @@ package horas;
$c1 =~ s/Quadragesima/Quadr/i;
$c1 =~ s/_\<BR\>_/_/;
$c2 =~ s/_\<BR\>_/<P ALIGN=CENTER>_<\/P>/;
print << "PrintTag";
print <<"PrintTag";
<TR><TD ALIGN=CENTER><A HREF=# onclick="callbrevi(\'$date1\');">$d1</FONT></A></TD>
<TD>$c1</TD>
<TD>$c2</TD>
<TD ALIGN=CENTER>$daynames[$dayofweek]</FONT></TD>
</TR>
PrintTag
}
print << "PrintTag";
print <<"PrintTag";
</TABLE><BR>
PrintTag
@versions = load_versions($datafolder);
Expand All @@ -293,15 +293,15 @@ package horas;
print option_selector("Version2", "document.forms[0].submit();", $version2, @versions);
if ($error) { print "<P ALIGN=CENTER><FONT COLOR=red>$error</FONT></P>\n"; }
if ($debug) { print "<P ALIGN=center><FONT COLOR=blue>$debug</FONT></P>\n"; }
print << "PrintTag";
print <<"PrintTag";
</FORM>
</BODY></HTML>
PrintTag

#*** horasjs()
# javascript functions called by htmlhead
sub horasjs {
print << "PrintTag";
print <<"PrintTag";
<SCRIPT TYPE='text/JavaScript' LANGUAGE='JavaScript1.2'>
Expand Down
24 changes: 12 additions & 12 deletions obsolete/horas/brevi.pl
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ package horas;
#*** print pages (setup, hora=pray, mainpage)
#generate HTML
htmlHead($title, 2);
print << "PrintTag";
print <<"PrintTag";
<BODY VLINK=$visitedlink LINK=$link BACKGROUND="$htmlurl/horasbg.jpg" onload="startup();">
<FORM ACTION="brevi.pl" METHOD=post TARGET=_self>
PrintTag
Expand All @@ -238,7 +238,7 @@ package horas;
$background = ($whitebground) ? "BGCOLOR=\"white\"" : "BACKGROUND=\"$htmlurl/horasbg.jpg\"";
horas($command);

print << "PrintTag";
print <<"PrintTag";
<P ALIGN=CENTER>
<INPUT TYPE=SUBMIT NAME='button' VALUE='$hora completed' onclick="okbutton();">
</P>
Expand All @@ -256,7 +256,7 @@ package horas;
$headline = setheadline();
headline($title);

print << "PrintTag";
print <<"PrintTag";
<P ALIGN=CENTER>
<TABLE BORDER=0 HEIGHT=$height><TR>
<TD ALIGN=CENTER><FONT COLOR=MAROON>Ordinarium</FONT></TD>
Expand Down Expand Up @@ -287,7 +287,7 @@ package horas;
#common widgets for main and hora
if ($pmode =~ /(main|hora)/i) {
if ($votive ne 'C9') {
print << "PrintTag";
print <<"PrintTag";
<P ALIGN=CENTER><I>
<A HREF=# onclick="hset('Matutinum');"><FONT COLOR=$hcolor[1]>$horas[1]</FONT></A>
&nbsp;&nbsp;
Expand All @@ -307,7 +307,7 @@ package horas;
</I></P>
PrintTag
} else {
print << "PrintTag";
print <<"PrintTag";
<P ALIGN=CENTER><I>
<A HREF=# onclick="hset('Matutinum');"><FONT COLOR=$hcolor[1]>$horas[1]</FONT></A>
&nbsp;&nbsp;
Expand All @@ -324,7 +324,7 @@ package horas;
$ch3 = ($expand =~ /nothing/i) ? 'SELECTED' : '';
$ch4 = ($expand =~ /skeleton/i) ? 'SELECTED' : '';

print << "PrintTag";
print <<"PrintTag";
<P ALIGN=CENTER>
<SELECT NAME=expand SIZE=4 onchange="parchange();">
<OPTION $ch1 VALUE='all'>all
Expand All @@ -340,7 +340,7 @@ package horas;
my $sel13 = ($testmode =~ /Saint/i) ? 'SELECTED' : '';
my $sel14 = ($testmode =~ /Common/i) ? 'SELECTED' : '';

print << "PrintTag";
print <<"PrintTag";
&nbsp;&nbsp;&nbsp;
Test: <SELECT NAME=testmode SIZE=4 onclick="parchange();">
<OPTION $sel11 VALUE='regular'>Regular
Expand All @@ -359,7 +359,7 @@ package horas;
$sel3 = ($votive =~ /C9/) ? 'SELECTED' : '';
$sel4 = ($votive =~ /C12/) ? 'SELECTED' : '';

print << "PrintTag";
print <<"PrintTag";
&nbsp;&nbsp;&nbsp;
<A HREF=# onclick="callkalendar();">Kalendarium</A>
&nbsp;&nbsp;&nbsp;
Expand Down Expand Up @@ -399,7 +399,7 @@ package horas;
$buildscript =~ s/\n/<BR>/g;
$buildscript =~ s/\_//g;
$buildscript =~ s/\,\,\,/\&nbsp\;\&nbsp\;\&nbsp\;/g;
print << "PrintTag";
print <<"PrintTag";
<TABLE BORDER=3 ALIGN=CENTER WIDTH=60% CELLPADDING=8><TR><TD ID=L$searchind>
$buildscript
</TD></TR><TABLE><BR>
Expand All @@ -413,7 +413,7 @@ package horas;

$command =~ s/(pray|setup)//ig;

print << "PrintTag";
print <<"PrintTag";
<INPUT TYPE=HIDDEN NAME=setup VALUE="$setupsave">
<INPUT TYPE=HIDDEN NAME=command VALUE="$command">
<INPUT TYPE=HIDDEN NAME=searchvalue VALUE="0">
Expand All @@ -428,7 +428,7 @@ package horas;
sub headline {
my $head = shift;
if ($headline =~ /\!/) { $headline = $` . "<FONT SIZE=1>" . $' . "</FONT>"; }
print << "PrintTag";
print <<"PrintTag";
<P ALIGN=CENTER><FONT COLOR=$daycolor>$headline<BR></FONT>
$comment<BR><BR>
<FONT COLOR=MAROON SIZE=+1><B><I>$head</I></B></FONT>
Expand All @@ -446,7 +446,7 @@ sub headline {
#*** Javascript functions
# the sub is called from htmlhead
sub horasjs {
print << "PrintTag";
print <<"PrintTag";
<SCRIPT TYPE='text/JavaScript' LANGUAGE='JavaScript1.2'>
Expand Down
6 changes: 3 additions & 3 deletions obsolete/horas/edit.pl
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ package horas;

#*** generate HTML head widgets
htmlHead($title, 2);
print << "PrintTag";
print <<"PrintTag";
<BODY VLINK=$visitedlink LINK=$link BACKGROUND=\"$htmlurl/horasbg.jpg\">
<FORM ACTION="edit.pl" METHOD=post TARGET=_self>
<TABLE ALIGN=CENTER BORDER=1 CELLPADDING=8><TR>
Expand Down Expand Up @@ -597,7 +597,7 @@ package horas;
if ($error) { print "<P ALIGN=CENTER><FONT COLOR=red>$error</FONT></P>\n"; }
if ($debug) { print "<P ALIGN=center><FONT COLOR=blue>$debug</FONT></P>\n"; }

print << "PrintTag";
print <<"PrintTag";
<INPUT TYPE=HIDDEN NAME=save VALUE='0'>
<INPUT TYPE=HIDDEN NAME=setup VALUE="$setupsave">
<INPUT TYPE=HIDDEN NAME=expand1 VALUE="$expand1">
Expand All @@ -614,7 +614,7 @@ package horas;

#*** javascript functions
sub horasjs {
print << "PrintTag";
print <<"PrintTag";
<SCRIPT TYPE='text/JavaScript' LANGUAGE='JavaScript1.2'>
Expand Down
8 changes: 4 additions & 4 deletions obsolete/horas/kalendarcomp.pl
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ package horas;
#*** print page
#generate HTML
htmlHead($title, 2);
print << "PrintTag";
print <<"PrintTag";
<BODY VLINK=$visitedlink LINK=$link BACKGROUND="$htmlurl/horasbg.jpg" >
<FORM ACTION="kalendarcomp.pl" METHOD=post TARGET=_self>
<H2 ALIGN=CENTER>$title</H2>
Expand Down Expand Up @@ -164,7 +164,7 @@ package horas;
print "<TR><TD ALIGN=center>$j. </TD><TD ALIGN=center>$flink1</TD><TD>$name1</TD>"
. "<TD></TD><TD ALIGN=center>$flink2</TD><TD>$name2</TD></TR>\n";
}
print << "PrintTag";
print <<"PrintTag";
</TABLE>
<BR>
</P>
Expand All @@ -177,7 +177,7 @@ package horas;

$command =~ s/(pray|setup)//ig;

print << "PrintTag";
print <<"PrintTag";
</FORM>
</BODY></HTML>
PrintTag
Expand Down Expand Up @@ -255,7 +255,7 @@ sub updaterank {
#*** Javascript functions
# the sub is called from htmlhead
sub horasjs {
print << "PrintTag";
print <<"PrintTag";
<SCRIPT TYPE='text/JavaScript' LANGUAGE='JavaScript1.2'>
Expand Down
4 changes: 2 additions & 2 deletions obsolete/horas/ordo.pl
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ package horas;

#*** generate HTML
htmlHead($title, 2);
print << "PrintTag";
print <<"PrintTag";
<BODY VLINK=$visitedlink LINK=$link BACKGROUND="$htmlurl/horasbg.jpg" >
<FORM ACTION="ordo.pl" METHOD=post TARGET=_new>
<H1 ALIGN=CENTER>Officium Divinum : Ordo</H1>
Expand All @@ -127,7 +127,7 @@ package horas;
#*** horasjs()
# javascript functions called by htmlhead
sub horasjs {
print << "PrintTag";
print <<"PrintTag";
<SCRIPT TYPE='text/JavaScript' LANGUAGE='JavaScript1.2'>
</SCRIPT>
Expand Down
10 changes: 5 additions & 5 deletions obsolete/missa/Ckalendar.pl
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ package missa;

#*** generate HTML
htmlHead($title, 2);
print << "PrintTag";
print <<"PrintTag";
<BODY VLINK=$visitedlink LINK=$link BACKGROUND="$htmlurl/horasbg.jpg" >
<FORM ACTION="Ckalendar.pl" METHOD=post TARGET=_self>
<INPUT TYPE=HIDDEN NAME=setup VALUE="$setupsave">
Expand Down Expand Up @@ -148,7 +148,7 @@ package missa;
print "<A HREF=# onclick=\"setkm($i)\">$mn</A>\n";
if ($i < 12) { print "&nbsp;&nbsp;&nbsp;\n" }
}
print << "PrintTag";
print <<"PrintTag";
<P ALIGN=CENTER>
<TABLE BORDER=$border WIDTH=90% CELLPADDING=3>
<TR><TH>Dies</TH><TH>de Tempore</TH><TH>Sanctorum</TH><TH>d.h.</TH><TR>
Expand Down Expand Up @@ -256,7 +256,7 @@ package missa;
$c1 =~ s/Quadragesima/Quadr/i;
$c1 =~ s/_\<BR\>_/_/;
$c2 =~ s/_\<BR\>_/<P ALIGN=CENTER>_<\/P>/;
print << "PrintTag";
print <<"PrintTag";
<TR><TD ALIGN=CENTER><A HREF=# onclick="callbrevi(\'$date1\');"><FONT SIZE=1>$d1</FONT></A></TD>
<TD>$c1</TD>
<TD>$c2</TD>
Expand All @@ -269,15 +269,15 @@ package missa;
print option_selector("Version2", "document.forms[0].submit();", $version2, @versions);
if ($error) { print "<P ALIGN=CENTER><FONT COLOR=red>$error</FONT><\P>\n"; }
if ($debug) { print "<P ALIGN=center><FONT COLOR=blue>$debug</FONT><\P>\n"; }
print << "PrintTag";
print <<"PrintTag";
</FORM>
</BODY></HTML>
PrintTag

#*** horasjs()
# javascript functions called by htmlhead
sub horasjs {
print << "PrintTag";
print <<"PrintTag";
<SCRIPT TYPE='text/JavaScript' LANGUAGE='JavaScript1.2'>
Expand Down
Loading

0 comments on commit 31946d1

Please sign in to comment.