slim 4.1.0 → 5.1.0

data/test/literate/TESTS.md

@@ -27,6 +27,22 @@ renders as
 Text block
 ~~~
 
+You can add leading or trailing white space with the `<` and `>` markers:
+
+~~~ slim
+|< Text with leading whitespace.
+|  Text with leading whitespace.
+|> Text with trailing whitespace.
+|<> Text with both leading and trailing whitespace.
+~~~
+
+renders as
+
+~~~ html
+ Text with leading whitespace. Text with leading whitespace.Text with trailing whitespace.  Text with both leading and trailing whitespace. 
+~~~
+
+
 Multiple lines can be indented beneath the first text line.
 
 ~~~ slim
@@ -77,6 +93,30 @@ Text
 lines
 ~~~
 
+~~~ slim
+|><
+
+   Text
+    block
+
+     with
+
+    multiple
+   lines
+~~~
+
+renders as
+
+~~~ html
+ Text
+ block
+
+  with
+
+ multiple
+lines 
+~~~
+
 You can nest text blocks beneath tags.
 
 ~~~ slim
@@ -95,13 +135,23 @@ renders as
 You can embed html code in the text which is not escaped.
 
 ~~~ slim
-| <a href="http://slim-lang.com">slim-lang.com</a>
+| <a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
+~~~
+
+renders as
+
+~~~ html
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
+~~~
+
+~~~ slim
+|<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 ### Text with trailing white space `'`
@@ -122,13 +172,13 @@ This is especially useful if you use tags behind a text block.
 
 ~~~ slim
 ' Link to
-a href="http://slim-lang.com" slim-lang.com
+a href="http://github.com/slim-template/slim" github.com/slim-template/slim
 ~~~
 
 renders as
 
 ~~~ html
-Link to <a href="http://slim-lang.com">slim-lang.com</a>
+Link to <a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 Multiple lines can be indented beneath the first text line.
@@ -186,13 +236,13 @@ lines
 HTML can be written directly.
 
 ~~~ slim
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">slim-lang.com</a>
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
 HTML tags allow nested blocks inside.
@@ -800,31 +850,31 @@ If a delimiter makes the syntax more readable for you, you can use the character
 
 ~~~ slim
 li
-  a(href="http://slim-lang.com" class="important") Link
+  a(href="http://github.com/slim-template/slim" class="important") Link
 li
-  a[href="http://slim-lang.com" class="important"] Link
+  a[href="http://github.com/slim-template/slim" class="important"] Link
 li
-  a{href="http://slim-lang.com" class="important"} Link
+  a{href="http://github.com/slim-template/slim" class="important"} Link
 ~~~
 
 renders as
 
 ~~~ html
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 <li>
-  <a class="important" href="http://slim-lang.com">Link</a>
+  <a class="important" href="http://github.com/slim-template/slim">Link</a>
 </li>
 ~~~
 
 If you wrap the attributes, you can spread them across multiple lines:
 
 ~~~ slim
-a(href="http://slim-lang.com"
+a(href="http://github.com/slim-template/slim"
 
      class="important") Link
 ~~~
@@ -832,7 +882,7 @@ a(href="http://slim-lang.com"
 renders as
 
 ~~~ html
-<a class="important" href="http://slim-lang.com">Link</a>
+<a class="important" href="http://github.com/slim-template/slim">Link</a>
 ~~~
 
 ~~~ slim
@@ -872,19 +922,19 @@ renders as
 You can use single or double quotes for simple text attributes.
 
 ~~~ slim
-a href="http://slim-lang.com" title='Slim Homepage' Goto the Slim homepage
+a href="http://github.com/slim-template/slim" title='Slim Homepage' Goto the Slim homepage
 ~~~
 
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com" title="Slim Homepage">Goto the Slim homepage</a>
+<a href="http://github.com/slim-template/slim" title="Slim Homepage">Goto the Slim homepage</a>
 ~~~
 
 You can use text interpolation in the quoted attributes:
 
 ~~~ slim
-- url='slim-lang.com'
+- url='github.com/slim-template/slim'
 a href="http://#{url}" Goto the #{url}
 a href="{"test"}" Test of quoted text in braces
 ~~~
@@ -892,7 +942,7 @@ a href="{"test"}" Test of quoted text in braces
 renders as
 
 ~~~ html
-<a href="http://slim-lang.com">Goto the slim-lang.com</a><a href="{&quot;test&quot;}">Test of quoted text in braces</a>
+<a href="http://github.com/slim-template/slim">Goto the github.com/slim-template/slim</a><a href="{&quot;test&quot;}">Test of quoted text in braces</a>
 ~~~
 
 The attribute value will be escaped by default. Use == if you want to disable escaping in the attribute.
@@ -1040,13 +1090,13 @@ You can configure attributes to be merged if multiple are given (See option `:me
 this is done for class attributes with the white space as delimiter.
 
 ~~~ slim
-a.menu class="highlight" href="http://slim-lang.com/" Slim-lang.com
+a.menu class="highlight" href="http://github.com/slim-template/slim/" github.com/slim-template/slim
 ~~~
 
 renders as
 
 ~~~ html
-<a class="menu highlight" href="http://slim-lang.com/">Slim-lang.com</a>
+<a class="menu highlight" href="http://github.com/slim-template/slim/">github.com/slim-template/slim</a>
 ~~~
 
 You can also use an `Array` as attribute value and the array elements will be merged using the delimiter.
@@ -1074,7 +1124,7 @@ with the :tag key.
 ~~~ slim
 ruby:
   def self.a_unless_current
-    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://slim-lang.com/'}
+    @page_current ? {tag: 'span'} : {tag: 'a', href: 'http://github.com/slim-template/slim/'}
   end
 - @page_current = true
 *a_unless_current Link
@@ -1085,7 +1135,7 @@ ruby:
 renders as
 
 ~~~ html
-<span>Link</span><a href="http://slim-lang.com/">Link</a>
+<span>Link</span><a href="http://github.com/slim-template/slim/">Link</a>
 ~~~
 
 ### Shortcuts

data/test/literate/run.rb

@@ -65,9 +65,9 @@ class LiterateTest < Temple::Engine
       @in_testcase = false
       result =  "  html = #{code.inspect}\n"
       if @opts.empty?
-        result << "  render(slim).must_equal html\nend\n"
+        result << "  _(render(slim)).must_equal html\nend\n"
       else
-        result << "  options = #{@opts.inspect}\n  render(slim, options).must_equal html\nend\n"
+        result << "  options = #{@opts.inspect}\n  _(render(slim, options)).must_equal html\nend\n"
       end
     end
 

data/test/rails/config/application.rb

@@ -6,9 +6,7 @@ require 'action_view/railtie'
 #require 'active_record/railtie'
 #require 'action_mailer/railtie'
 require 'sprockets/railtie'
-
 require 'slim'
-require 'slim-rails/register_engine'
 
 module Dummy
   class Application < Rails::Application
@@ -42,20 +40,5 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
-
-    # From slim-rails fix for "ActionView::Template::Error: Unknown line indicator"
-    # https://github.com/slim-template/slim-rails/blob/991589ea5648e5e896781e68912bc51beaf4102a/lib/slim-rails/register_engine.rb
-    if config.respond_to?(:assets)
-      config.assets.configure do |env|
-        if env.respond_to?(:register_transformer) && Sprockets::VERSION.to_i > 3
-          env.register_mime_type 'text/slim', extensions: ['.slim', '.slim.html']
-          env.register_transformer 'text/slim', 'text/html', Slim::Rails::RegisterEngine::Transformer
-        elsif env.respond_to?(:register_engine)
-          args = ['.slim', Slim::Template]
-          args << { silence_deprecation: true } if Sprockets::VERSION.start_with?('3')
-          env.register_engine(*args)
-        end
-      end
-    end
   end
 end

data/test/rails/test/test_slim.rb

@@ -46,18 +46,12 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_html "<h1>Hello Slim!</h1><p>With a partial!</p>"
   end
 
-  if RUBY_ENGINE == 'jruby' && RUBY_ENGINE < '2.2.0'
-    puts 'Streaming test disabled for JRuby < 9000.',
-      'See https://github.com/jruby/jruby/issues/1243',
-      'and https://github.com/jruby/jruby/issues/1789'
-  else
-    puts 'Streaming test enabled.'
-    test "streaming" do
-      get "/slim/streaming"
-      output = "2f\r\n<!DOCTYPE html><html><head><title>Dummy</title>\r\nd\r\n</head><body>\r\n17\r\nHeading set from a view\r\n15\r\n<div class=\"content\">\r\n53\r\n<p>Page content</p><h1><p>Hello Streaming!</p></h1><h2><p>Hello Streaming!</p></h2>\r\n14\r\n</div></body></html>\r\n0\r\n\r\n"
-      assert_equal output, @response.body
-    end
-  end
+  # TODO Reenable streaming test
+  # test "streaming" do
+  #   get "/slim/streaming"
+  #   output = "2f\r\n<!DOCTYPE html><html><head><title>Dummy</title>\r\nd\r\n</head><body>\r\n17\r\nHeading set from a view\r\n15\r\n<div class=\"content\">\r\n53\r\n<p>Page content</p><h1><p>Hello Streaming!</p></h1><h2><p>Hello Streaming!</p></h2>\r\n14\r\n</div></body></html>\r\n0\r\n\r\n"
+  #   assert_equal output, @response.body
+  # end
 
   test "render integers" do
     get "/slim/integers"

data/test/sinatra/helper.rb

@@ -8,8 +8,6 @@ if ENV['COVERAGE']
 end
 
 ENV['APP_ENV'] = 'test'
-Encoding.default_external = "UTF-8" if defined? Encoding
-
 RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
 
 require 'rack'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,28 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.6
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +35,7 @@ dependencies:
         version: 2.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +45,7 @@ dependencies:
         version: 2.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -63,8 +57,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - CHANGES
 - Gemfile
@@ -72,14 +66,6 @@ files:
 - README.jp.md
 - README.md
 - Rakefile
-- benchmarks/context.rb
-- benchmarks/profile-parser.rb
-- benchmarks/profile-render.rb
-- benchmarks/run-benchmarks.rb
-- benchmarks/run-diffbench.rb
-- benchmarks/view.erb
-- benchmarks/view.haml
-- benchmarks/view.slim
 - bin/slimrb
 - doc/include.md
 - doc/jp/include.md
@@ -106,6 +92,7 @@ files:
 - lib/slim/logic_less/context.rb
 - lib/slim/logic_less/filter.rb
 - lib/slim/parser.rb
+- lib/slim/railtie.rb
 - lib/slim/smart.rb
 - lib/slim/smart/escaper.rb
 - lib/slim/smart/filter.rb
@@ -177,7 +164,6 @@ files:
 - test/rails/config/initializers/backtrace_silencers.rb
 - test/rails/config/initializers/inflections.rb
 - test/rails/config/initializers/mime_types.rb
-- test/rails/config/initializers/secret_token.rb
 - test/rails/config/initializers/session_store.rb
 - test/rails/config/locales/en.yml
 - test/rails/config/routes.rb
@@ -195,7 +181,7 @@ files:
 - test/sinatra/views/layout2.slim
 - test/smart/test_smart_text.rb
 - test/translator/test_translator.rb
-homepage: http://slim-lang.com/
+homepage: http://github.com/slim-template/slim/
 licenses:
 - MIT
 metadata: {}
@@ -207,14 +193,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Slim is a template language.

data/.travis.yml

@@ -1,38 +0,0 @@
-# https://www.ruby-lang.org/en/downloads/releases/
-language: ruby
-rvm:
-  - 2.6.1
-  - 2.5.3
-  - 2.4.5
-  - jruby-9.2.6.0
-  - jruby-9.1.17.0
-
-# Recommend sudo required when using trusty dist
-# https://docs.travis-ci.com/user/reference/trusty/
-sudo: required
-dist: trusty
-
-script: "bundle exec rake $TASK"
-
-after_success:
-  - bundle exec codeclimate-test-reporter
-
-env:
-  global:
-    - secure: "a7sD9iwPJJn3Fj+mn62GAmy/PEguh3elrilsp1KS+WfDiCiIKD8Q5KG2Jv67DGcQAGI3dPWeh7+ZhZ/W7nEipwWUBmSvGYVeoF63y8j6mNRLeekqspj94l47hXyFePj9bCadY1b1/xY4lE1pMEU8eA8AOUHUqCSuH+Kk/MuvyLM="
-  matrix:
-    - "TASK=test:core_and_plugins"
-    - "TASK=test:rails RAILS=6.0.0.beta2"
-    - "TASK=test:rails RAILS=5.2.2"
-    - "TASK=test:rails RAILS=5.2.1.1"
-    - "TASK=test:rails RAILS=5.2.1"
-    - "TASK=test:sinatra SINATRA=2.0.5"
-    - "TASK=test:sinatra SINATRA=2.0.4"
-    - "TASK=test:sinatra SINATRA=2.0.3"
-
-matrix:
-  exclude:
-    - rvm: 2.4.5
-      env: "TASK=test:rails RAILS=6.0.0.beta2"
-    - rvm: jruby-9.1.17.0
-      env: "TASK=test:rails RAILS=6.0.0.beta2"

data/benchmarks/context.rb

@@ -1,11 +0,0 @@
-class Context
-  def header
-    'Colors'
-  end
-
-  def item
-    [ { name: 'red',   current: true,  url: '#red'   },
-      { name: 'green', current: false, url: '#green' },
-      { name: 'blue',  current: false, url: '#blue'  } ]
-  end
-end

data/benchmarks/profile-parser.rb

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-engine = Slim::Engine.new
-
-1000.times { engine.call(content) }

data/benchmarks/profile-render.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-slim = Slim::Template.new { content }
-context = Context.new
-
-10000.times { slim.render(context) }

data/benchmarks/run-benchmarks.rb

@@ -1,120 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-
-require 'benchmark/ips'
-require 'tilt'
-require 'erubis'
-require 'erb'
-require 'haml'
-
-class SlimBenchmarks
-  def initialize(slow)
-    @benches   = Hash.new { |h, k| h[k] = [] }
-
-    @erb_code  = File.read(File.dirname(__FILE__) + '/view.erb')
-    @haml_code = File.read(File.dirname(__FILE__) + '/view.haml')
-    @slim_code = File.read(File.dirname(__FILE__) + '/view.slim')
-
-    init_compiled_benches
-    init_tilt_benches
-    init_parsing_benches if slow
-  end
-
-  def init_compiled_benches
-    haml = Haml::Engine.new(@haml_code, format: :html5, escape_attrs: false)
-
-    context  = Context.new
-
-    haml.def_method(context, :run_haml)
-    context.instance_eval %{
-      def run_erb; #{ERB.new(@erb_code).src}; end
-      def run_erubis; #{Erubis::Eruby.new(@erb_code).src}; end
-      def run_temple_erb; #{Temple::ERB::Engine.new.call @erb_code}; end
-      def run_fast_erubis; #{Erubis::FastEruby.new(@erb_code).src}; end
-      def run_slim_pretty; #{Slim::Engine.new(pretty: true).call @slim_code}; end
-      def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
-    }
-
-    bench(:compiled, 'erb')         { context.run_erb }
-    bench(:compiled, 'erubis')      { context.run_erubis }
-    bench(:compiled, 'fast erubis') { context.run_fast_erubis }
-    bench(:compiled, 'temple erb')  { context.run_temple_erb }
-    bench(:compiled, 'slim pretty') { context.run_slim_pretty }
-    bench(:compiled, 'slim ugly')   { context.run_slim_ugly }
-    bench(:compiled, 'haml')        { context.run_haml }
-  end
-
-  def init_tilt_benches
-    tilt_erb         = Tilt::ERBTemplate.new { @erb_code }
-    tilt_erubis      = Tilt::ErubisTemplate.new { @erb_code }
-    tilt_temple_erb  = Temple::ERB::Template.new { @erb_code }
-    tilt_haml        = Tilt::HamlTemplate.new(format: :html5) { @haml_code }
-    tilt_slim_pretty = Slim::Template.new(pretty: true) { @slim_code }
-    tilt_slim_ugly   = Slim::Template.new { @slim_code }
-
-    context  = Context.new
-
-    bench(:tilt, 'erb')         { tilt_erb.render(context) }
-    bench(:tilt, 'erubis')      { tilt_erubis.render(context) }
-    bench(:tilt, 'temple erb')  { tilt_temple_erb.render(context) }
-    bench(:tilt, 'slim pretty') { tilt_slim_pretty.render(context) }
-    bench(:tilt, 'slim ugly')   { tilt_slim_ugly.render(context) }
-    bench(:tilt, 'haml')        { tilt_haml.render(context) }
-  end
-
-  def init_parsing_benches
-    context  = Context.new
-    context_binding = context.instance_eval { binding }
-
-    bench(:parsing, 'erb')         { ERB.new(@erb_code).result(context_binding) }
-    bench(:parsing, 'erubis')      { Erubis::Eruby.new(@erb_code).result(context_binding) }
-    bench(:parsing, 'fast erubis') { Erubis::FastEruby.new(@erb_code).result(context_binding) }
-    bench(:parsing, 'temple erb')  { Temple::ERB::Template.new { @erb_code }.render(context) }
-    bench(:parsing, 'slim pretty') { Slim::Template.new(pretty: true) { @slim_code }.render(context) }
-    bench(:parsing, 'slim ugly')   { Slim::Template.new { @slim_code }.render(context) }
-    bench(:parsing, 'haml')        { Haml::Engine.new(@haml_code, format: :html5).render(context) }
-  end
-
-  def run
-    @benches.each do |group_name, group_benches|
-      puts "Running #{group_name} benchmarks:"
-
-      Benchmark.ips do |x|
-        group_benches.each do |name, block|
-          x.report("#{group_name} #{name}", &block)
-        end
-
-        x.compare!
-      end
-    end
-
-    puts "
-Compiled benchmark: Template is parsed before the benchmark and
-    generated ruby code is compiled into a method.
-    This is the fastest evaluation strategy because it benchmarks
-    pure execution speed of the generated ruby code.
-
-Compiled Tilt benchmark: Template is compiled with Tilt, which gives a more
-    accurate result of the performance in production mode in frameworks like
-    Sinatra, Ramaze and Camping. (Rails still uses its own template
-    compilation.)
-
-Parsing benchmark: Template is parsed every time.
-    This is not the recommended way to use the template engine
-    and Slim is not optimized for it. Activate this benchmark with 'rake bench slow=1'.
-
-Temple ERB is the ERB implementation using the Temple framework. It shows the
-overhead added by the Temple framework compared to ERB.
-"
-  end
-
-  def bench(group, name, &block)
-    @benches[group].push([name, block])
-  end
-end
-
-SlimBenchmarks.new(ENV['slow']).run

data/benchmarks/run-diffbench.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-require 'diffbench'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-engine = Slim::Engine.new
-template = Slim::Template.new { content }
-context = Context.new
-
-DiffBench.bm do
-  report("Parse") do
-    2000.times { engine.call(content) }
-  end
-  report("Render") do
-    100000.times { template.render(context) }
-  end
-end

data/benchmarks/view.erb

@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-
-<html lang="en">
-  <head>
-    <title>Simple Benchmark</title>
-    <meta charset="utf-8">
-    <meta name="description" content="This is an example of a meta description.">
-  </head>
-  <body>
-    <h1><%= header %></h1>
-    <% unless item.empty? %>
-      <ul>
-      <% for i in item %>
-        <% if i[:current] %>
-          <li><strong><%= i[:name] %></strong></li>
-        <% else %>
-          <li><a href="<%= i[:url] %>"><%= i[:name] %></a></li>
-        <% end %>
-      <% end %>
-      </ul>
-    <% else %>
-      <p>The list is empty.</p>
-    <% end %>
-  </body>
-</html>