diff options
-rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 1 | ||||
-rw-r--r-- | lib/sisu/v3/concordance.rb | 4 | ||||
-rw-r--r-- | lib/sisu/v3/defaults.rb | 105 | ||||
-rw-r--r-- | lib/sisu/v3/epub_concordance.rb | 2 | ||||
-rw-r--r-- | lib/sisu/v3/epub_format.rb | 13 | ||||
-rw-r--r-- | lib/sisu/v3/html_format.rb | 52 | ||||
-rw-r--r-- | lib/sisu/v3/xml_format.rb | 25 |
7 files changed, 63 insertions, 139 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index b2c5b02b..751247a1 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -36,6 +36,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.3.orig.tar.xz * if, else, remove some semicolons (;) replace with newlines * if true ; x, remove semicolons replace with "then" * .is_a?(X) replaces .class==X (& for some defined? and nil? tests) + * remove javascript holders js_ (not used) * v3: sisu -v, provide version information, fix diff --git a/lib/sisu/v3/concordance.rb b/lib/sisu/v3/concordance.rb index 2a3b585a..a7581112 100644 --- a/lib/sisu/v3/concordance.rb +++ b/lib/sisu/v3/concordance.rb @@ -118,7 +118,7 @@ module SiSU_Concordance @fnb=@md.fnb @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="#{@file.path_rel_links.html_seg_2}_sisu/image/sisu.png" alt="SiSU home -->"></a>} @doc_details =<<WOK -<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right"> </td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.html_segtoc}" #{@vz.js_toc}><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table> +<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right"> </td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.html_segtoc}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table> WOK end def create @@ -151,10 +151,8 @@ WOK <link rel="generator" href="http://www.jus.uio.no/sisu" /> <link rel="shortcut icon" href="../_sisu/image/rb7.ico" /> #{stylesheet.css_head_seg} - #{@vz.js_head} </head> <body> - #{@vz.js_top} #{top_band} #{toc} <div class="#{div_class}"> diff --git a/lib/sisu/v3/defaults.rb b/lib/sisu/v3/defaults.rb index 47e3c970..6a082813 100644 --- a/lib/sisu/v3/defaults.rb +++ b/lib/sisu/v3/defaults.rb @@ -80,75 +80,6 @@ module SiSU_Viz #% php def php_persist end - #% javascript #kxjs knxjs - def js_home - end - def js_infobox - end - def js_knxjs - end - def js_head - end - def js_top - end - def js_sisu - end - def js_home - end - def js_sponsor - end - def js_books - end - def js_journals - end - def js_conferences - end - def js_services - end - def js_catalogue - end - def js_doc - end - def js_toc - end - def js_seg - end - def js_mail - end - def js_manifest - end - def js_status - end - def js_next - end - def js_prev - end - def js_plaintext - end - def js_portrait - end - def js_landscape - end - def js_pdf - end - def js_epub - end - def js_odf - end - def js_concordance - end - def js_instruments - end - def js_external - end - def js_gopher - end - def js_ftp - end - def js_law - end - def js_disclaimer - end def semantic_tags def default { @@ -1187,7 +1118,7 @@ module SiSU_Viz #% banner def banner_home %{ <center> - <a href="#{url_site}/" target="_top" #{js_home}> + <a href="#{url_site}/" target="_top"> #{png_site} </a> <br /> @@ -1202,23 +1133,23 @@ module SiSU_Viz end def banner_home_guide %{ <br /> - <a href="#{url_site}/" target="_top" #{js_home}> + <a href="#{url_site}/" target="_top"> #{png_doc} LM toc </a> - <a href="../treaties.and.organisations/lm.chronological" target="_top" #{js_instruments}> + <a href="../treaties.and.organisations/lm.chronological" target="_top"> #{png_doc} LM 20** </a> <br />} end def banner_home_button_only - %{<a href="#{url_site}/" #{js_home}> + %{<a href="#{url_site}/"> #{png_home_button} </a>} end def banner_home_button #yellow_dark now white %{<table summary="home button" width="100%" border="0" cellpadding="3" bgcolor= "#ffffff" align="center"> <tr><td align="left" valign="middle" bgcolor="#{color_white}" width="10%"> - <a href="#{url_site}/" #{js_home}> + <a href="#{url_site}/"> #{png_home_button} </a> </td> @@ -1230,7 +1161,7 @@ module SiSU_Viz <tr><td width="20%"> <table summary="home button" width="100%" border="0" cellpadding="3" align="center"> <tr><td align="center" valign="middle" bgcolor="#{color_white}"> - <a href="#{url_site}/" target="_top" #{js_home}> + <a href="#{url_site}/" target="_top"> #{png_home} </a> </td></tr> @@ -1240,7 +1171,7 @@ module SiSU_Viz <table summary="other contents buttons" border="0" cellpadding="3" cellspacing="0"> <tr><td align="center" bgcolor=#{color_band2}> <font face="arial" size="2"> - <a href="toc" target="_top" #{js_toc}> + <a href="toc" target="_top"> This text's sub- <br /> Table of Contents @@ -1254,12 +1185,12 @@ module SiSU_Viz #{table_close}} end def banner_url_txt_sisu - %{<a href="#{url_sisu}/sisu" target="_top" #{js_home}>SiSU</a>} + %{<a href="#{url_sisu}/sisu" target="_top">SiSU</a>} end def banner_band #yellow_dark now white %{<table summary="home button" width="100%" border="0" cellpadding="3" bgcolor= "#ffffff" align="center"> <tr><td align="left" valign="middle" bgcolor="#{color_white}"> - <a href="#{url_site}/" target="_top" #{js_home}> + <a href="#{url_site}/" target="_top"> #{png_home} </a> </td> @@ -1541,7 +1472,7 @@ WOK <<WOK <p class="tiny"><font color="#666666" size="2"> Output generated by - <a href="#{url_sisu}" #{js_sisu}> + <a href="#{url_sisu}"> #{@v[:project]} </a> #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]}) @@ -1562,7 +1493,7 @@ WOK <!-- widget sisu --> <tr><td valign="top" width="10%"> <p class="tiny_left"><font color="#666666" size="2"> - <a href="#{url_sisu}" #{js_sisu}> + <a href="#{url_sisu}"> <img border="0" src="../_sisu/image/sisu.png" alt="SiSU" width="120" height="39" /> </a> </font></p> @@ -1570,33 +1501,33 @@ WOK <!-- SiSU Rights --> <p class="tiny_left"><font color="#666666" size="2"> Output generated by - <a href="#{url_sisu}" #{js_sisu}> + <a href="#{url_sisu}"> #{@v[:project]} </a> #{@v[:version]} #{@v[:date]} (#{@v[:date_stamp]}) <br /> - <a href="#{url_sisu}" #{js_sisu}> + <a href="#{url_sisu}"> <b>#{@v[:project]}</b> </a> Copyright <sup>©</sup> Ralph Amissah 1997, current #{@date.year_static}. All Rights Reserved. <br /> - <a href="#{url_sisu}" #{js_sisu}> + <a href="#{url_sisu}"> #{@v[:project]} </a> is software for document structuring, publishing and search, <br /> - <a href="#{url_sisu}" #{js_sisu}> + <a href="#{url_sisu}"> www.sisudoc.org/ </a> and - <a href="#{url_sisudoc}" #{js_sisu}> + <a href="#{url_sisudoc}"> www.sisudoc.org </a> <br /> <i>w3 since October 3 1993</i> - <a href="mailto:ralph@amissah.com" #{js_mail}> + <a href="mailto:ralph@amissah.com"> ralph@amissah.com </a> </font></p> @@ -1624,7 +1555,7 @@ WOK </font></p> </td><td valign="top" width="45%"> <p class="tiny_left"><font color="#666666" size="2"> - <a href="#{url_sisu}" #{js_sisu}> + <a href="#{url_sisu}"> #{@v[:project]} </a> is released under diff --git a/lib/sisu/v3/epub_concordance.rb b/lib/sisu/v3/epub_concordance.rb index 224578b6..b8db317d 100644 --- a/lib/sisu/v3/epub_concordance.rb +++ b/lib/sisu/v3/epub_concordance.rb @@ -105,7 +105,7 @@ module SiSU_EPUB_Concordance @fnb=@md.fnb @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home -->"></a>} @doc_details =<<WOK -<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right"> </td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.epub}" #{@vz.js_toc}><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.creator.author}</p></td></tr></table> +<table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right"> </td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.epub}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.creator.author}</p></td></tr></table> WOK end def create diff --git a/lib/sisu/v3/epub_format.rb b/lib/sisu/v3/epub_format.rb index cc98219c..ab6f34c7 100644 --- a/lib/sisu/v3/epub_format.rb +++ b/lib/sisu/v3/epub_format.rb @@ -1673,7 +1673,7 @@ WOK end def copyat %{<p class="tiny">copy @ - <a href="#{@vz.url_home}" #{@vz.js_home}> + <a href="#{@vz.url_home}"> #{@vz.txt_home} </a></p>} end @@ -1706,11 +1706,11 @@ WOK : %{<p class="align_right">#{firstseg}</p>} end def manifest_link(text) - %{ <a href="#{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}" target="_top" #{@vz.js_manifest}>#{text}</a>} + %{ <a href="#{@md.file.output_path.manifest.url}/#{@md.file.base_filename.manifest}" target="_top">#{text}</a>} end def concordance_link(text) if @md.concord_make - %{<a href="#{@md.file.base_filename.html_concordance}" target="_top" #{@vz.js_concordance}> + %{<a href="#{@md.file.base_filename.html_concordance}" target="_top"> #{text} </a>} else '' @@ -1722,14 +1722,13 @@ WOK <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> #{@css.xhtml_epub} </head> -#{@vz.color_body} -#{@vz.js_top}} +#{@vz.color_body}} end def concordance if @md.concord_make %{#{@vz.margin_css} <h4 class="toc"> - <a href="./#{@md.file.base_filename.html_concordance}" #{@vz.js_concordance}> + <a href="./#{@md.file.base_filename.html_concordance}"> <i>Concordance</i> </a> </h4> @@ -1787,7 +1786,7 @@ WOK def metadata %{#{@vz.margin_css} <h4 class="toc"> - <a href="#{@metalink}" #{@vz.js_metalink}> + <a href="#{@metalink}"> <i>MetaData</i> </a> </h4> diff --git a/lib/sisu/v3/html_format.rb b/lib/sisu/v3/html_format.rb index e16cbc5d..433652e0 100644 --- a/lib/sisu/v3/html_format.rb +++ b/lib/sisu/v3/html_format.rb @@ -184,7 +184,7 @@ module SiSU_HTML_Format end def copyat %{#{@vz.paragraph_font_tiny}copy @ - <a href="#{@vz.url_home}" #{@vz.js_home}> + <a href="#{@vz.url_home}"> #{@vz.txt_home} </a></h1>} end @@ -213,7 +213,7 @@ module SiSU_HTML_Format def scroll(text) if @md.fns =~ /\.(?:-|ssm\.)?sst$/ scroll=%{<td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{Xx[:html_relative1]}html/#{@file.base_filename.html_scroll}" target="_top" #{@vz.js_doc}> + <a href="#{Xx[:html_relative1]}html/#{@file.base_filename.html_scroll}" target="_top"> #{text} </a> </td> @@ -222,7 +222,7 @@ module SiSU_HTML_Format end def seg(text) %{<td align="center" bgcolor="#99CC66"> - <a href="#{@md.file.base_filename.html_segtoc}" target="_top" #{@vz.js_doc}> + <a href="#{@md.file.base_filename.html_segtoc}" target="_top"> #{text} </a> </td> @@ -244,7 +244,7 @@ module SiSU_HTML_Format else @file.base_filename.manifest end %{<td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{manifest_lnk}" target="_top" #{@vz.js_manifest}> + <a href="#{manifest_lnk}" target="_top"> #{@vz.nav_txt_manifest} </a> </td>} @@ -256,12 +256,12 @@ module SiSU_HTML_Format and @cf_defaults.cf_0 =~/p/ %{ <td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{Xx[:html_relative1]}pdf/#{@file.base_filename.pdf_p}" target="_top" #{@vz.js_portrait}> + <a href="#{Xx[:html_relative1]}pdf/#{@file.base_filename.pdf_p}" target="_top"> #{@vz.nav_txt_pdf_portrait} </a> </td> <td align="center" bgcolor=#{@vz.color_band2}> - <a href="#{Xx[:html_relative1]}pdf/#{@file.base_filename.pdf_l}" target="_top" #{@vz.js_portrait}> + <a href="#{Xx[:html_relative1]}pdf/#{@file.base_filename.pdf_l}" target="_top"> #{@vz.nav_txt_pdf_landscape} </a> </td> @@ -331,13 +331,13 @@ WOK def manifest_link(text) # @file=SiSU_Env::FileOp.new(@md) if @md %{<font size=2> - <a href="#{@md.file.base_filename.manifest}" target="_top" #{@vz.js_manifest}>#{text}</a> + <a href="#{@md.file.base_filename.manifest}" target="_top">#{text}</a> </font>} end def concordance_link(text) if @md.concord_make %{<font size=2> - <a href="#{@md.file.base_filename.html_concordance}" target="_top" #{@vz.js_concordance}> + <a href="#{@md.file.base_filename.html_concordance}" target="_top"> #{text} </a> </font>} @@ -394,14 +394,13 @@ WOK #{@vz.color_body} <a name="top" id="top"></a> <a name="up" id="up"></a> -<a name="start" id="start"></a> -#{@vz.js_top}} +<a name="start" id="start"></a>} end def concordance if @md.concord_make %{#{@vz.margin_css} <h4 class="toc"> - <a href="./#{@md.file.base_filename.html_concordance}" #{@vz.js_concordance}> + <a href="./#{@md.file.base_filename.html_concordance}"> <i>Concordance</i> </a> </h4> @@ -418,7 +417,7 @@ WOK <div id="vertical_links"> <ul id="vertical"> <li class="refbold"> - <a href="#{url}" #{@vz.js_home}> + <a href="#{url}"> #{@vz.txt_hp} </a> </li> @@ -439,7 +438,7 @@ WOK <div id="horizontal_links"> <ul id="horizontal"> <li class="refbold"> - <a href="#{url}" #{@vz.js_home}> + <a href="#{url}"> #{@vz.txt_hp} </a> </li> @@ -545,7 +544,7 @@ WOK def metadata %{#{@vz.margin_css} <h4 class="toc"> - <a href="#{@metalink}" #{@vz.js_metalink}> + <a href="#{@metalink}"> <i>MetaData</i> </a> </h4> @@ -634,17 +633,17 @@ WOK end %{<table summary="segment hidden control pre and next" width="100%" border="0" cellpadding="0" bgcolor=#{@vz.color_grey_pale} align="center"> <tr><td align="left"> - <a href="#{pre}" target="_top" #{@vz.js_prev}> + <a href="#{pre}" target="_top"> #{png_nav.dot_pre} </a> </td> <td align="center"> - <a href="#{up}" target="_top" #{@vz.js_toc}> + <a href="#{up}" target="_top"> #{png_nav.dot_toc} </a> </td> <td align="right"> - <a href="#{nxt}" target="_top" #{@vz.js_next}> + <a href="#{nxt}" target="_top"> #{png_nav.dot_nxt} </a> #{@vz.table_close}} @@ -655,17 +654,17 @@ WOK nxt="#{@md.file.base_filename.html_segtoc}" %{<table summary="segment hidden control pre" width="100%" border="0" cellpadding="0" bgcolor=#{@vz.color_grey_pale} align="center"> <tr><td align="left"> - <a href="#{pre}" target="_top" #{@vz.js_prev}> + <a href="#{pre}" target="_top"> #{png_nav.dot_pre} </a> </td> <td align="center"> - <a href="#{up}" target="_top" #{@vz.js_toc}> + <a href="#{up}" target="_top"> #{png_nav.dot_toc} </a> </td> <td align="right"> - <a href="#{nxt}" target="_top" #{@vz.js_next}> + <a href="#{nxt}" target="_top"> #{png_nav.dot_nxt} </a> #{@vz.table_close}} @@ -673,17 +672,17 @@ WOK def toc_nav(f_pre=false,f_nxt=false,use=1) pre=nxt='' toc=%{<td align="center" bgcolor=#{@vz.color_band1}> - <a href="#{@toc}" target="_top" #{@vz.js_toc}> + <a href="#{@toc}" target="_top"> #{png_nav.toc} </a> </td>} pre=%{<td align="center" bgcolor=#{@vz.color_band1}> - <a href="#{@seg_name_html[@seg_name_html_tracker-use]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top" #{@vz.js_prev}> + <a href="#{@seg_name_html[@seg_name_html_tracker-use]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top"> #{png_nav.pre} </a> </td>} if f_pre==true nxt=%{<td align="center" bgcolor=#{@vz.color_band1}> - <a href="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top" #{@vz.js_next}> + <a href="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:html]}" target="_top"> #{png_nav.nxt} </a> </td>} if f_nxt==true @@ -714,7 +713,7 @@ WOK end def manifest_link(text) %{<font size=2> - <a href="#{@md.file.base_filename.manifest}" target="_top" #{@vz.js_manifest}> + <a href="#{@md.file.base_filename.manifest}" target="_top"> #{text} </a> </font>} @@ -722,7 +721,7 @@ WOK def concordance_link(text) if @md.concord_make %{<font size=2> - <a href="#{@md.file.base_filename.html_concordance}" target="_top" #{@vz.js_concordance}> + <a href="#{@md.file.base_filename.html_concordance}" target="_top"> #{text} </a> </font>} @@ -856,8 +855,7 @@ WOK #{@vz.color_body} <a name="top" id="top"></a> <a name="up" id="up"></a> -<a name="start" id="start"></a> -#{@vz.js_top}} +<a name="start" id="start"></a>} end def title_banner(title,subtitle,creator) %{ diff --git a/lib/sisu/v3/xml_format.rb b/lib/sisu/v3/xml_format.rb index 54d889cd..1c6aa67d 100644 --- a/lib/sisu/v3/xml_format.rb +++ b/lib/sisu/v3/xml_format.rb @@ -389,7 +389,7 @@ WOK end def copyat %{#{@vz.paragraph_font_tiny}copy @ - <a href="#{@vz.url_home}" #{@vz.js_home}> + <a href="#{@vz.url_home}"> #{@vz.txt_home} </a></font>} end @@ -541,8 +541,7 @@ WOK #{@vz.color_body} <a name="top" id="top"></a> <a name="up" id="up"></a> -<a name="start" id="start"></a> -#{@vz.js_top}} +<a name="start" id="start"></a>} end def links_guide_open(type='horizontal') if type=='vertical'; links_guide_vertical_open @@ -629,7 +628,7 @@ WOK def metadata %{#{@vz.margin_css} <h4 class="toc"> - <a href="#{@metalink}" #{@vz.js_metalink}> + <a href="#{@metalink}"> <i>MetaData</i> </a> </h4> @@ -719,25 +718,24 @@ WOK #{@vz.color_body} <a name="top" id="top"></a> <a name="up" id="up"></a> -<a name="start" id="start"></a> -#{@vz.js_top}} +<a name="start" id="start"></a>} end def title_banner(title,subtitle,creator) end def dot_control_pre_next %{<table summary="segment hidden control pre and next" width="100%" border="0" cellpadding="0" bgcolor=#{@vz.color_grey_pale} align="center"> <tr><td align="left"> - <a href="#{@seg_name_html[@seg_name_html_tracker-1]}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top" #{@vz.js_prev}> + <a href="#{@seg_name_html[@seg_name_html_tracker-1]}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top"> #{@vz.png_nav_dot_pre} </a> </td> <td align="center"> - <a href="#{@index}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top" #{@vz.js_toc}> + <a href="#{@index}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top"> #{@vz.png_nav_dot_toc} </a> </td> <td align="right"> - <a href="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top" #{@vz.js_next}> + <a href="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top"> #{@vz.png_nav_dot_nxt} </a> #{@vz.table_close}} @@ -745,17 +743,17 @@ WOK def toc_nav(f_pre=false,f_nxt=false,use=1) pre=nxt='' toc=%{<td align="center" bgcolor=#{@vz.color_band1}> - <a href="#{@index}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top" #{@vz.js_toc}> + <a href="#{@index}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top"> #{@vz.png_nav_toc} </a> </td>} pre=%{<td align="center" bgcolor=#{@vz.color_band1}> - <a href="#{@seg_name_html[@seg_name_html_tracker-use]}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top" #{@vz.js_prev}> + <a href="#{@seg_name_html[@seg_name_html_tracker-use]}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top"> #{@vz.png_nav_pre} </a> </td>} if f_pre==true nxt=%{<td align="center" bgcolor=#{@vz.color_band1}> - <a href="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top" #{@vz.js_next}> + <a href="#{@seg_name_html[@seg_name_html_tracker+1]}#{@md.lang_code_insert}#{Sfx[:xhtml]}" target="_top"> #{@vz.png_nav_nxt} </a> </td>} if f_nxt==true @@ -935,8 +933,7 @@ WOK #{@vz.color_body} <a name="top" id="top"></a> <a name="up" id="up"></a> -<a name="start" id="start"></a> -#{@vz.js_top}} +<a name="start" id="start"></a>} end def title_banner(title,subtitle,creator) %{ |