From 354731c43c5d5b8d050564025e26fdc3bc85acb9 Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Sun, 11 Sep 2011 14:03:37 +0000 Subject: [PATCH] the refactoring continues ... --- helm/software/helena/Makefile | 36 ++++++--------- helm/software/helena/Makefile.common | 6 +-- helm/software/helena/icons/b3.png | Bin 866 -> 0 bytes helm/software/helena/icons/b4.png | Bin 865 -> 0 bytes helm/software/helena/icons/b5.png | Bin 867 -> 0 bytes helm/software/helena/icons/b9.png | Bin 878 -> 0 bytes helm/software/helena/icons/basic-32.png | Bin 587 -> 0 bytes helm/software/helena/icons/crux-16.ico | Bin 318 -> 0 bytes helm/software/helena/icons/crux-32.png | Bin 375 -> 0 bytes helm/software/helena/icons/helena-32.png | Bin 549 -> 0 bytes helm/software/helena/icons/helena-label.png | Bin 2346 -> 0 bytes helm/software/helena/icons/rainbow.png | Bin 18662 -> 0 bytes helm/software/helena/src/common/options.ml | 2 +- .../helena/xml/{ld-html.css => ld.css} | 42 ----------------- helm/software/helena/xml/ld.dtd | 6 +-- helm/software/helena/xml/lddl.css | 43 ++++++++++++++++++ .../helena/xml/{ld-html.xsl => lddl.xsl} | 8 ++-- .../{ld-html-entity.xsl => lddl_entry.xsl} | 0 .../{ld-html-library.xsl => lddl_library.xsl} | 0 .../xml/{ld-html-root.xsl => lddl_root.xsl} | 25 +++++----- .../xml/{ld-html-term.xsl => lddl_term.xsl} | 0 21 files changed, 81 insertions(+), 87 deletions(-) delete mode 100644 helm/software/helena/icons/b3.png delete mode 100644 helm/software/helena/icons/b4.png delete mode 100644 helm/software/helena/icons/b5.png delete mode 100644 helm/software/helena/icons/b9.png delete mode 100644 helm/software/helena/icons/basic-32.png delete mode 100644 helm/software/helena/icons/crux-16.ico delete mode 100644 helm/software/helena/icons/crux-32.png delete mode 100644 helm/software/helena/icons/helena-32.png delete mode 100644 helm/software/helena/icons/helena-label.png delete mode 100644 helm/software/helena/icons/rainbow.png rename helm/software/helena/xml/{ld-html.css => ld.css} (59%) create mode 100644 helm/software/helena/xml/lddl.css rename helm/software/helena/xml/{ld-html.xsl => lddl.xsl} (87%) rename helm/software/helena/xml/{ld-html-entity.xsl => lddl_entry.xsl} (100%) rename helm/software/helena/xml/{ld-html-library.xsl => lddl_library.xsl} (100%) rename helm/software/helena/xml/{ld-html-root.xsl => lddl_root.xsl} (81%) rename helm/software/helena/xml/{ld-html-term.xsl => lddl_term.xsl} (100%) diff --git a/helm/software/helena/Makefile b/helm/software/helena/Makefile index d8aa348f4..248d12606 100644 --- a/helm/software/helena/Makefile +++ b/helm/software/helena/Makefile @@ -14,24 +14,22 @@ TAGS = test-si test-si-fast profile xml-si xml-si-crg html test-html \ install-html install-lddl install-dtd install-xml instal-css -XMLS = xml/brg-si/grundlagen/l/not.ld.xml \ - xml/brg-si/grundlagen/l/et.ld.xml \ - xml/brg-si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ - xml/brg-si/grundlagen/l/e/pairis1.ld.xml \ - xml/brg-si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ - xml/crg-si/grundlagen/l/not.ld.xml \ - xml/crg-si/grundlagen/l/et.ld.xml \ - xml/crg-si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ - xml/crg-si/grundlagen/l/e/pairis1.ld.xml \ - xml/crg-si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ - xml/brg-si/grundlagen/ccs.ldc.xml +XMLS = xml/brg_si/grundlagen/l/not.ld.xml \ + xml/brg_si/grundlagen/l/et.ld.xml \ + xml/brg_si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ + xml/brg_si/grundlagen/l/e/pairis1.ld.xml \ + xml/brg_si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ + xml/crg_si/grundlagen/l/not.ld.xml \ + xml/crg_si/grundlagen/l/et.ld.xml \ + xml/crg_si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \ + xml/crg_si/grundlagen/l/e/pairis1.ld.xml \ + xml/crg_si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \ + xml/brg_si/grundlagen/ccs.ldc.xml include Makefile.common INPUT = examples/grundlagen/grundlagen.aut -SLS = helena.sl automath.sl - test-si: $(MAIN).opt etc @echo " HELENA -p -o -c $(INPUT)" $(H)./$(MAIN).opt -p -o -c -S 3 $(O) $(INPUT) > etc/log.txt @@ -63,7 +61,7 @@ etc: %.ld: @echo " XSLT $@" $(H)mkdir -p $(LOCALLDDLDIR)/$(@D) - $(H)$(XSLT) -o $(LOCALLDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml + $(H)$(XSLT) -o $(LOCALLDDLDIR)/$@.html $(BASEURL) xml/lddl.xsl xml/$@.xml %.ldc: @echo " SKIP $@" @@ -99,12 +97,4 @@ install-css: xml/ld-html.css install-xml: etc/make-html.sh @echo " INSTALL xml" - $(H)scp -r xml/index.txt xml/ld.dtd xml/brg-si/ xml/crg-si/ $(XMLDIR) - -install-icons: - @echo " INSTALL *.png *.ico" - $(H)scp icons/*.png icons/*.ico $(DOWNDIR) - -install-jed: - @echo " INSTALL $(SLS)" - $(H)scp $(SLS:%=$(HOME)/jed/%) $(DOWNDIR) + $(H)scp -r xml/index.txt xml/ld.dtd xml/brg_si/ xml/crg_si/ $(XMLDIR) diff --git a/helm/software/helena/Makefile.common b/helm/software/helena/Makefile.common index 80019a800..00c54f873 100644 --- a/helm/software/helena/Makefile.common +++ b/helm/software/helena/Makefile.common @@ -1,6 +1,6 @@ H=@ ifeq ($(origin OCAMLPATH), undefined) - OCAMLFIND = OCAMLPATH=$(HOME)/svn/software/components/METAS ocamlfind + OCAMLFIND = OCAMLPATH=$(HOME)/svn/helm-stable/software/components/METAS ocamlfind else OCAMLFIND = ocamlfind endif @@ -9,8 +9,8 @@ RELISE = $(MAIN:%=%_$(shell cat MakeVersion)) LDDLURL = http://lambda-delta.info/static/lddl LDDLDIR = mowgli:/projects/helm/public_html/lambda-delta/static/lddl -DOWNDIR = mowgli:/projects/helm/public_html/lambda-delta/download -XMLDIR = mowgli:/projects/helm/public_html/lambda-delta/xml +DOWNDIR = $(HOME)/svn/helm-stable/www/lambda_delta/download +XMLDIR = mowgli:/projects/helm/public_html/lambda_delta/xml LOCALLDDLDIR = $(HOME)/public_html/lddl DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make)) diff --git a/helm/software/helena/icons/b3.png b/helm/software/helena/icons/b3.png deleted file mode 100644 index 3ed53892311471fa901cda67aa34774bbfc709cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 866 zcmV-o1D*VdP)Px#8&FJCMF0Q*D-jS%JU9OU|72ujySuypzyIUl=l}ozmq?O;00009a7bBm000id z000id0mpBsWB>pF2XskIMF-jk3l9w+DXRK?0008bNkldh(5QZ0(`V1;a zIi~6#sI}6jM_aX9jzNNkV;ofCVUW)O9r%IwvCA!BY+7uQhxCG~M1YJs}Z()UZ1;F?N{MJiDr@nTgQ zRr;)$pm?6=LrO;+Q4Jy9zSkpmlYQK-s_F@`6swR-Q9LLqrR=9E*KX1ijZfubXXQZ? zYD}%D#UOGduAtInnYzPokyxgVSgB%}VzypO)H8G@6mL+Vod>=UzZWUcz9mrA>JV8f z3&SwiBKS&a&jON&jxtXhmhgbU3gg034Du1L5En`hp87jU3ABz?0dhRTP$@V=h!b1~ zDj3fAyoCCjFC zD9XrJilIPOjdvbBr0%JMRd@K%S{9|B@hM44-F3W|p%NtvD1ubuLQLGMgi01dOmJ32RL$_571Voi~z7jI6b%ckKr!A(xP?10#{{_P1BsWx|t&3gZbU;jK!j3U45w zhVqXueZuNV8wDxer(|bL2wF~T=S9x$*bj<@Pl%lk-n+iJ50bWJk|CMo`)OWF*(GYp2iR;6Te@ARRJ zYb?btYC0&xcct}r>`)J-k<~kE7);HH1cI?+gP}w@*euSB=J1o0CFjCr;5MV*P&G`N z06jN!xM`D_OkD}GOgtDai|2_7SNkz4 sW~e;R;8c;p31=JUZ=CpYd;Wm+7hW$Osf&tt82|tP07*qoM6N<$f&)T=-~a#s diff --git a/helm/software/helena/icons/b4.png b/helm/software/helena/icons/b4.png deleted file mode 100644 index ccfd1a99a7ceaec63a2b029ecf6810dbca746f70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 865 zcmV-n1D^beP)Px#8&FJCMF0Q*D-jS%JU3)yWV^e&|G)s_;OGDEzyJUL5Fd(z00009a7bBm000id z000id0mpBsWB>pF2XskIMF-jk3l9@AxHOs90008aNklt%M*-R%mv-g&feY!90sf+lWT;~qurO?_m(4Kb`||4 z`7adzhg92N=JQlDh&oSY_G-J3F}JCUYpCs#`nV6ZK;3HT+oeiyO{K*mm8g$+v8s(K zeO63RJkRqXr6Z20h7fPt>k*sDKCW--`U$ZVtB_1lJg6w8?6)b`X3`UlPvv4qhB~a&^lHJ$ngk6rQi%94sac) zU}W`Pl?XWSLR5iv86JL>jo%5bp5+w^Lf>h%|Ox&r2N)}{9s;wOA z#|u#jOHC>D{F6f+SCUGMti7jq?FT0zmyoRkBa!a**H_wQ!h?ni;|V9>ol2+*Zy=zC z^3N}Q!um-Y1u5RAWJgR0S`KXEMb7Tn4vK|Oh@B4JxxVjHK4W)OLR|w(@o!dEOZpxL zk-LY!SXt?yhkGw^sJt?=WJ2F`CvYb~`$s2qO*054DSod@+6=oh42HW_rDSsN^r4Jv zEX6NsIw-?;mGyV*Q1_LQ)jMk#OwEY|g0XXhp+q&cYha<;1R65k7?@|}h#2C}vc;5J(hA*>nw28^&`>`5R z{seUyL1u5e)ZrCHCaAKyh7w(U4F&H4hx_TxoD{mU=h)7lJt=f19t@Yo^F)oS{TLN9 rRGw#Ws>tAkvySsOPJFpNf57?+AWCgDjhFOd00000NkvXXu0mjfSOS5I diff --git a/helm/software/helena/icons/b5.png b/helm/software/helena/icons/b5.png deleted file mode 100644 index 30cace1d17078267e517e173afff24ccce3a8be3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmV-p1DyPcP)Px#8&FJCMF0Q*D-jS%JU3)yWB~sFySuyN;OD>pzyJULqs+#B00009a7bBm000id z000id0mpBsWB>pF2XskIMF-jk3lADG@c(lp0008cNkldh(5QZ1g%2yCY z$}yGt18li&Io8rD+hY(S<=BH&e2gO+d?j@8{_M`qe!vnSK2+U{F@8MrGV|`RM9i+D zza;;K;{T9p`^$WuY6el~smxyO7Bc2Gb#V=~TT&nQp%$ncEq%9C39hNMSfmp55ieG? zQKip{35w@=KBRQS5!Ddl?Rq_8JK4w0s;-|9OR);c6vcyzQp$dta&0F)(fCv@c2piT zp~lpTS_~pb;tDEFmZ>}Z7Kvr*jFl>uDQ4@nL_I@iLh%L#+Iip$@oSL+?HdABtxu7q zvM>yDErPF<_ADTY=qU5FVF?citS~Mt#ULN?3UQ(IFN^&@IoI|BUJ^C(n5lxIS-Hqps-)ZF(fx91O7e*sM#Noz{P04e|g002ovPDHLkV1hypiOK)~ diff --git a/helm/software/helena/icons/b9.png b/helm/software/helena/icons/b9.png deleted file mode 100644 index 0de5598679741b5208b03c2251b5e351932a8e20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 878 zcmV-!1CjiRP)Px#Ay7%%z)tkVGd000McNliru+6M~{7Xf34J;eY30@F!EK~zY`y_Ua@n?Ml8 z7okKhK`0bgU5fO!tXK(85f>}%r8fkTJKZi)*OelKQw0wLsly>AR&$ za80GfB9*9*c(JODDt%T=P(07`A*CaZsD==4*Xt46$v$pYRrQ2eid9IaC?1rQQufo7 zYdh(Q#;0c~FKQr{iZ>|G&I4bF z--{Gz-w>#3b%-pLg<+U$5qzbzX8}n>N13M$OL#zFg>hji2Kk6rhzq3$PyL;w1X{?52?mFJfP>GTS6hW$S zAtr8BLM00_BGr}-_5FpYgtexWdj83w&TB~}M%LcbyY_>VkW0wcfssge`^zisGT})> zh4F-w@Kz;Mg*OmTL;1&-K4JBwje->KQ?fHA1T81F^&)3?>;}ccC&W$%?_J;bDW9=B zDxt1{rT7mkt0jF8gUH=OU#+Zk(8Il#I8Rj^!BCPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXW0 z4K^^NM)4{D000_vMObu0Z*6U5Zgc=bVRLC?AZ%f6Vq{@0WMyo0VM_!tQvd(~rAb6V zR9M5sma$I4P!xtgZXy&Pz&IG<)WN~Up>ZKGA^H?uTzmkXd;lkW02ULTp_2^>35#K1 zVPIf^!GV=UiVVl$UXlW#meBToNtdQQ|9}2-?`=yWBBW#n41obK0=|JVa0XlfH^4P; zPI^lJ8CU^b;2ro)S+op119!m5F$TVXSB~QixINUs3TOf$*>DfM>`7zCzz^_b=9?uK zKnplcGOz+3a}bZ4_}EH9#UE(qD2}P!+`6aY3oayoLZh`Yf|Xe)MG~4(D9k=Dnr=LS zhXW3otSAGYfSOql$7s#~HN+l6Kn*M!7yxQy(ZDFp*D!Aswh`AA0XvuLio)~kb?MI0x+sN?8&_H-TRu>XPS6nZ`AbfDjd@mQZ9wHkPyKHKYcxV%hV Z@(qdG-JR002ovPDHLkV1gng==uNv diff --git a/helm/software/helena/icons/crux-16.ico b/helm/software/helena/icons/crux-16.ico deleted file mode 100644 index 7323c8af8a6fc93033836e619b391e684f41794e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcma)$F$x4R2t~~#(`&PJ5CT&MBz+1GFoEoS=Vn=Dx`kcl%lE1LLV#d}h}IJv0pJAy zhZ)V;?Dv0KV0BqynJ=4{56>hb`>CoTwaw&=ZFXaoHZ`e4XV)rDP4Q-be`#Ybg9!7@ cz?<(#oSlJ~w=$57xs2fC{UoAiU;a*g0I8)SGynhq diff --git a/helm/software/helena/icons/crux-32.png b/helm/software/helena/icons/crux-32.png deleted file mode 100644 index be5524e5eb0637de48d4b6fd5fb9376c6bbb9c38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 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 diff --git a/helm/software/helena/icons/rainbow.png b/helm/software/helena/icons/rainbow.png deleted file mode 100644 index 45925baa7339e31a86c3ef8ef0df3578f4c9597f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18662 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

!xPek@sn= zQCy=NoHFkc;<+Av^8aM|3OGp!hC-wlMlr8(y@l>R3D-UpesljIZ+u(AE@rUpm9U0l z9W#oFuv6>M4Ddcy^P!$8s+4GqLdTM+Kn2g#GY&9QN9HX`QU~@FLhnkk$xq?cl!cdo z*rLs*IB2oL2VT{VMEa7tXD^(eFe748oFEC1E{y=>zBSCW>z<4L^mIsw9wx z4W3IZLT+kb>DgfxzSh5WHu#~N#_dJC9S>u_5eZDhDa}8HK@_LZ`#J{mB$CW-&x6Sd z#f8>iP`MfdxXt$n+Vm1uZ`LE<-a(H`QbC4^K))opRE}bVlaVG5=fwU*F1T(@IaN*XK>`R{C$`+pDgjr4FE{u1Pb!-U4aVsZ2b?q zKnkMu22;`>Qgf6Yb}Dh5llRjTYd{yLxe1KWfyD+V+5p-~&nh>ZrDhu<&Y8j}k&{Wz zhYWJ`1R{O+&aK|CtQFMjlKS!W{jeo%g_^ILuju$I?T*D zH-mlXdL~UQlFO5|XqQ5%5Ktd@D-S_b2ZaMF zJF8U!mnmJvY&SA2>@p7j`AuhPTIz|YXBxbjX*URi^b|HVL$GtX@hHqZ%5^Sw-RtzK zhxp@H$gl5}Y3_2eeR-^b>8VT|~wZ-Pqkz1eb04?J+CeJ!zwxj;r zg$d^5wiVh~leCj+DlVn9^YzrehAUuf10TRNV+@qzbm&$omx_S4m!W&1?)_2e@~B=| z6Sy-X3hZiw=O{iz5I%;v>H$@cUMp*OR`I1aBSJmK3m?%kM`&<+(=5saJD2`$$ z!k)Yn=S=z-Y4=Ns|m+-&Kgw(W08;Kbg5-h!0@${f4{lIXR;bj4OsK6pxF_b+kaDrvx)<6<%jR z^(s-|L6}~$fd)+6lHe~s>#J!vuSH?hqa_?btw4wA8_Tnw_9n*z%{RL37$4bdEpu!ZidLm!3mYYhL1tc(2Sr1!#B!c2=m0`Zwj0`VPb+3po)$%= z201Vd(VElBZe|mcAQtrDH8XC4EQ~=p!t5H=x0K_49@9Zqal)0o*@BZRtmMKLj*;^# z+8jxM7`lc3p`UTAM%iKnbYf~ba}i449?q^(q-Y#Wh@1E@YTXSL-kp<2WtmH;DKZU= z0u9MAz-AQ_41yV5>KY@2pH_5(s(1`5aiW%po#)WvT%)Nnbwo~RTLmp#p~gt7)k{J6 z!O8Bo69Y-*sm1FIwmIg(YFH3f+ur0UytUm4FUW;c+Cv+ibpDvC_moy+!{e+G}nrJu%VQMpueKa zK1Z@DCd@0#HSXCAm>D(%$A`zb{&pq@8>SElq>>XPV03RhpGMA24hwkIRCt6?87{54 z%&wJEwevt!rq!B2GIb&-@tf3&F{oZv3}OWNbIAigc9QTieJ&K^=IB?p4sYFO7?%G} zz(CMxTm^*=PRS_58TRHoq*W`?G=xrB5LxEREaZl09x2GMN&^d|GqX#xtgQ2fFduR5D&a&-e`D+fR=b#%>jY}M{y(qXK}pN4m4^TT002ov JPDHLkV1h-mh0Fi| diff --git a/helm/software/helena/src/common/options.ml b/helm/software/helena/src/common/options.ml index c133bed7c..8cc200ad9 100644 --- a/helm/software/helena/src/common/options.ml +++ b/helm/software/helena/src/common/options.ml @@ -45,7 +45,7 @@ let kernel_id () = | Brg -> "brg" | Bag -> "bag" in - let si = if !si then "-si" else "" in + let si = if !si then "_si" else "" in id ^ si let get_baseuri () = diff --git a/helm/software/helena/xml/ld-html.css b/helm/software/helena/xml/ld.css similarity index 59% rename from helm/software/helena/xml/ld-html.css rename to helm/software/helena/xml/ld.css index 705e15993..92d2e8d92 100644 --- a/helm/software/helena/xml/ld-html.css +++ b/helm/software/helena/xml/ld.css @@ -61,45 +61,3 @@ a:active, a:hover, a:focus { width: 88px; height: 32px; /* this should be 31px */ } - -/* terms ********************************************************************/ - -.separator { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.sort { - background: rgb(255, 255, 255); - color: rgb(128, 0, 255); -} - -.lref { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.gref { - background: rgb(255, 255, 255); - color: rgb(0, 0, 255); -} - -.appl { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} - -.cast { - background: rgb(255, 255, 255); - color: rgb(255, 0, 0); -} - -.local { - background: rgb(255, 255, 255); - color: rgb(0, 160, 0); -} - -.global { - background: rgb(255, 255, 255); - color: rgb(0, 0, 0); -} diff --git a/helm/software/helena/xml/ld.dtd b/helm/software/helena/xml/ld.dtd index 3939d6f5b..3dd881315 100644 --- a/helm/software/helena/xml/ld.dtd +++ b/helm/software/helena/xml/ld.dtd @@ -1,6 +1,6 @@ - + @@ -103,7 +103,7 @@ @@ -135,6 +135,6 @@ diff --git a/helm/software/helena/xml/lddl.css b/helm/software/helena/xml/lddl.css new file mode 100644 index 000000000..41a635d45 --- /dev/null +++ b/helm/software/helena/xml/lddl.css @@ -0,0 +1,43 @@ +@charset "UTF-8"; + +/* terms ********************************************************************/ + +.separator { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); +} + +.sort { + background: rgb(255, 255, 255); + color: rgb(128, 0, 255); +} + +.lref { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); +} + +.gref { + background: rgb(255, 255, 255); + color: rgb(0, 0, 255); +} + +.appl { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); +} + +.cast { + background: rgb(255, 255, 255); + color: rgb(255, 0, 0); +} + +.local { + background: rgb(255, 255, 255); + color: rgb(0, 160, 0); +} + +.global { + background: rgb(255, 255, 255); + color: rgb(0, 0, 0); +} diff --git a/helm/software/helena/xml/ld-html.xsl b/helm/software/helena/xml/lddl.xsl similarity index 87% rename from helm/software/helena/xml/ld-html.xsl rename to helm/software/helena/xml/lddl.xsl index d21a6bbf9..2711cff96 100644 --- a/helm/software/helena/xml/ld-html.xsl +++ b/helm/software/helena/xml/lddl.xsl @@ -17,10 +17,10 @@ - - - - + + + + - - lambda-delta digital library (LDDL) + + lambda_delta digital library (LDDL) +

[lambda-delta home]
@@ -44,7 +47,7 @@
[Spacer]
@@ -70,15 +73,15 @@ /> [Powered by Helena lambda-delta processor] [PNG used here]