From e0129313c49ccfc783ee7f67737322f6a19f6d85 Mon Sep 17 00:00:00 2001 From: dfs Date: Thu, 23 Apr 1998 02:57:06 +0000 Subject: [PATCH] -- Made the SHADE and MOON specials work in rem2html. -- Added little moon icons. --- www/Makefile | 20 +++++++++++++-- www/firstquarter.gif | Bin 0 -> 957 bytes www/fullmoon.gif | Bin 0 -> 944 bytes www/hebdate.rem-DIST | 16 ++++-------- www/lastquarter.gif | Bin 0 -> 957 bytes www/newmoon.gif | Bin 0 -> 934 bytes www/rem2html | 59 ++++++++++++++++++++++++++++++++++++++----- 7 files changed, 76 insertions(+), 19 deletions(-) create mode 100644 www/firstquarter.gif create mode 100644 www/fullmoon.gif create mode 100644 www/lastquarter.gif create mode 100644 www/newmoon.gif diff --git a/www/Makefile b/www/Makefile index dbdd2a5f..00efe75c 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2,7 +2,7 @@ # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# $Id: Makefile,v 1.7 1997-08-31 17:17:51 dfs Exp $ +# $Id: Makefile,v 1.8 1998-04-23 02:57:06 dfs Exp $ # The complete name of your www host. Example: www.mycompany.com WWWHOST = shevy.skoll.ca @@ -13,7 +13,7 @@ WWWHOST = shevy.skoll.ca SCRIPTDIR = /var/web/cgi-bin # SCRIPTDIR = /home/dfs/Remind/www/TEST -# Where the scripts live as seen from the outside world. If +# Where the scripts live as seen by the web browser. If # they live in WWWHOST/cgi-bin, supply /cgi-bin CGIDIR = /cgi-bin @@ -22,6 +22,12 @@ CGIDIR = /cgi-bin # path as seen by the UNIX operating system HTMLDIR = /home/dfs/public_html +# Where you stick images, as seen by UNIX +IMAGEDIR = /home/dfs/public_html + +# Where images are, as seen by web browers +IMAGEBASE = /~dfs + # Location. Typically, the name of your city or town. Example: Ottawa LOCATION = Ottawa # LOCATION = New York @@ -38,6 +44,7 @@ SEDSCRIPT = -e 's/Ottawa/$(LOCATION)/g' \ -e 's@http://your.machine/your.dir@http://$(WWWHOST)$(CGIDIR)@g' \ -e 's@%SCRIPTDIR%@$(SCRIPTDIR)@g' \ -e 's@%REMIND%@$(REMIND)@g' \ + -e 's@%IMAGEBASE%@$(IMAGEBASE)@g' \ -e 's@%REM2PS%@$(REM2PS)@g' all: @@ -53,12 +60,21 @@ install: sed $(SEDSCRIPT) < sunrise.rem-DIST > $(SCRIPTDIR)/sunrise.rem sed $(SEDSCRIPT) < sunset.rem-DIST > $(SCRIPTDIR)/sunset.rem sed $(SEDSCRIPT) < calendar.html-DIST > $(HTMLDIR)/calendar.html + sed $(SEDSCRIPT) < rem2html > $(SCRIPTDIR)/rem2html chmod 644 $(SCRIPTDIR)/sunrise.rem chmod 644 $(SCRIPTDIR)/moon.rem chmod 644 $(SCRIPTDIR)/hebdate.rem chmod 644 $(SCRIPTDIR)/sunset.rem chmod 644 $(HTMLDIR)/calendar.html chmod 755 $(SCRIPTDIR)/cal_dispatch + chmod 755 $(SCRIPTDIR)/rem2html chmod 755 $(SCRIPTDIR)/calps $(SCRIPTDIR)/hebdate \ $(SCRIPTDIR)/hebps $(SCRIPTDIR)/moon $(SCRIPTDIR)/sunrise \ $(SCRIPTDIR)/sunset $(SCRIPTDIR)/hebhtml $(SCRIPTDIR)/rem2html + + cp firstquarter.gif fullmoon.gif lastquarter.gif newmoon.gif $(IMAGEDIR) + chmod 644 $(IMAGEDIR)/firstquarter.gif $(IMAGEDIR)/fullmoon.gif $(IMAGEDIR)/lastquarter.gif $(IMAGEDIR)/newmoon.gif + + + + diff --git a/www/firstquarter.gif b/www/firstquarter.gif new file mode 100644 index 0000000000000000000000000000000000000000..21d1f3033751fbd3083270d1cbf5a39b222f93cf GIT binary patch literal 957 zcmV;u148^qNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW3IG8BEC2ui01yBW000O^00Rgd2%zA=g9i&5G>9;OLWKkYAbiMB zpu~t2Ct`f4(ILf(1U-IiDDfjmixx*F+z4?c%Zn%zW=z>oWJ#DcMdsYuFdzUS`2+z9 z0096j000004*(AU00=(-0|*=lpy0rR1PcNPU=X1~g$WNnY$$MH#fcUPUYzKVA;yde fKO*!fvSUe&Bp-I%2oWVqiWEaGj5)I9!GHieC5p9a literal 0 HcmV?d00001 diff --git a/www/fullmoon.gif b/www/fullmoon.gif new file mode 100644 index 0000000000000000000000000000000000000000..8d78eb37b7153c54d41d3ba4c1997ca7023bce02 GIT binary patch literal 944 zcmV;h15f-%Nk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW3IG8BEC2ui01yBW000O*00RgdNU)&6000smB&bke!-5YP0)V&> zA;XFe2TsJeaU({H9ywb4I5Olxk0uRA literal 0 HcmV?d00001 diff --git a/www/hebdate.rem-DIST b/www/hebdate.rem-DIST index 07f48ff2..8b8934ac 100644 --- a/www/hebdate.rem-DIST +++ b/www/hebdate.rem-DIST @@ -3,7 +3,7 @@ # This file is part of REMIND. # Copyright (C) 1992-1997 by David F. Skoll -# $Id: hebdate.rem-DIST,v 1.4 1998-02-16 02:21:45 dfs Exp $ +# $Id: hebdate.rem-DIST,v 1.5 1998-04-23 02:57:07 dfs Exp $ BANNER % IF !$PSCAL @@ -162,18 +162,12 @@ IF !$PSCAL REM 20 ++40 msg Also available: a PostScript calendar (about 35KB) for %m %y, complete with Hebrew dates, Jewish holidays, and moon phases for Ottawa. (This takes a few seconds to generate.) REM 20 ++40 msg And: an HTML version of the above. (No moons, and your browser must handle tables.) ELSE -IF !HTML - REM Sat PS [psshade(95)] - [trigger(moondate(0))] PS [psmoon(0)] - [trigger(moondate(1))] PS [psmoon(1)] - [trigger(moondate(2))] PS [psmoon(2)] - [trigger(moondate(3))] PS [psmoon(3)] + [trigger(moondate(0))] SPECIAL MOON 0 + [trigger(moondate(1))] SPECIAL MOON 1 + [trigger(moondate(2))] SPECIAL MOON 2 + [trigger(moondate(3))] SPECIAL MOON 3 REM PS Border Border moveto /DayFont findfont 10 scalefont setfont ([hebday(today())] [hebmon(today())]) show -ELSE - [trigger(moondate(0))] SPECIAL HTML

New Moon

- [trigger(moondate(2))] SPECIAL HTML

Full Moon

REM SPECIAL HTML

[hebday(today())] [hebmon(today())]

-ENDIF ENDIF diff --git a/www/lastquarter.gif b/www/lastquarter.gif new file mode 100644 index 0000000000000000000000000000000000000000..8184d1aca7b7ff6b7a5a070d683547669474a1ed GIT binary patch literal 957 zcmV;u148^qNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW3IG8BEC2ui01yBW000O^00RgdNU)&6000smB&aZNk%w1VGsZi0OtSz000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^8LW3IG8BEC2ui01yBW000O&00Rgd2%zA=g9i&LG>9<3!iNkALR^?| z;zNlR6$;D<(IH2QA1QkLh>>H(j0j0KoY*jB#Fj7-1_S^h`2+z90096j000004*(AU z00=Yy0|*=lpy0rR1PdwzfH1(qhXxZuR48#GMTZs_V$8^~qeq4x1%?#K@nFY>6C0Y0 IcrYLUJJ>+1od5s; literal 0 HcmV?d00001 diff --git a/www/rem2html b/www/rem2html index 7b7e862f..51a4b447 100755 --- a/www/rem2html +++ b/www/rem2html @@ -2,7 +2,7 @@ # rem2html # -# $Id: rem2html,v 1.6 1998-02-12 03:32:17 dfs Exp $ +# $Id: rem2html,v 1.7 1998-04-23 02:57:08 dfs Exp $ # # A script to convert from the output of "remind -p" to Hyper-Text Markup # Language (HTML), the text format used in WWW documents. By default, it @@ -33,6 +33,11 @@ use Getopt::Long; @months = (January,February,March,April,May,June,July,August,September,October,November,December); +$DefaultImageDir = "%IMAGEBASE%"; +if ($DefaultImageDir =~ m@/$@) { + chop $DefaultImageDir; +} + $rem2html_version = "1.0"; &parse_options(); @@ -123,7 +128,8 @@ sub parse_input { local $type; local $day; @days = (); - + @shades = (); + @moons = (); while (<>) { chomp($_); if (/rem2(html|ps) begin/) { @@ -146,10 +152,51 @@ sub parse_input { $type = $4; $msg = $8; $day = $3; - next unless ($type eq "HTML" || ($type eq "*")); if ($type eq "HTML") { $days[$day] .= "$msg "; - } else { + } elsif ($type eq "MOON") { + my($phase, $text); + if ($msg =~ /^\s*(\d+)\s+\S+\s+\S+\s+(.*)$/) { + $phase = $1; + $text = $2; + } elsif ($msg =~ /^\s*(\d+)/) { + $phase = $1; + $text = ""; + } else { + next; + } + next if ($phase > 3); + if ($phase == 0) { + $text = "

\"New " . escape_html($text); + } elsif ($phase == 1) { + $text = "

\"First " . escape_html($text); + } elsif ($phase == 2) { + $text = "

\"Full " . escape_html($text); + } else { + $text = "

\"Last " . escape_html($text); + } + $moons[$day] = $text . " "; + } elsif ($type eq "SHADE") { + my($red, $green, $blue); + if ($msg =~ /^\s*(\d+)\s+(\d+)\s+(\d+)\s*$/) { + $red = $1; + $green = $2; + $blue = $3; + } elsif ($msg =~ /^\s*(\d+)\s*$/) { + $red = $1; + $green = $1; + $blue = $1; + } else { + next; + } + next if ($red > 255 || $green > 255 || $blue > 255); + $shades[$day] = sprintf(" BGCOLOR=\"#%02X%02X%02X\"", + $red, $green, $blue); + } elsif ($type eq "*") { $msg = &escape_html($msg); $days[$day] .= "

$msg

"; } @@ -252,8 +299,8 @@ sub output_data { if ($day > 0 && $day <= $month_length) { print < -

$fday

+ +

$moons[$day]$fday

$msg EndOfHTML