publify_core 10.0.0 → 10.0.2

data/app/views/setup/index.html.erb

@@ -1,17 +1,48 @@
+<div class="row">
+  <div class="col-md-8 col-md-offset-2" id="error-message-page">
+    <% if this_blog.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= t("errors.template.header", model: 'blog', count: this_blog.errors.count) %></h2>
+        <p><%= t("errors.template.body") %></p>
+        <ul>
+          <% this_blog.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+    <% if @user.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= t("errors.template.header", model: 'blog', count: @user.errors.count) %></h2>
+        <p><%= t("errors.template.body") %></p>
+        <ul>
+          <% @user.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+  </div>
+</div>
+
 <%= form_tag action: 'index' do %>
   <div class='alert alert-info'>
     <small><%= t('.welcome_to_your_blog_setup', publify: link_to('Publify', 'https://publify.github.io/')) %></small>
   </div>
-  <div class='form-group'>
-    <%= text_field(:setting, :blog_name, class: 'form-control', placeholder: t('.blog_name')) %>
-  </div>
-  <div class='form-group'>
-    <%= text_field(:setting, :email, class: 'form-control', placeholder: t('.your_mail')) %>
-  </div>
-  <div class='form-group'>
-    <%= label_tag :setting_password, t('.password') %><br />
-    <%= password_field(:setting, :password, class: 'form-control') %>
-  </div>
+  <%= fields model: this_blog do |form| %>
+    <div class='form-group'>
+      <%= form.text_field(:blog_name, class: 'form-control', placeholder: t('.blog_name')) %>
+    </div>
+  <% end %>
+  <%= fields model: @user do |form| %>
+    <div class='form-group'>
+      <%= form.text_field(:email, class: 'form-control', placeholder: t('.your_mail')) %>
+    </div>
+    <div class='form-group'>
+      <%= form.label :password, t('.password') %><br>
+      <%= form.password_field(:password, class: 'form-control') %>
+    </div>
+  <% end %>
 
-  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save') %>" />
+  <input type="submit" id="submit" class='btn btn-lg btn-success btn-block' value="<%= t('generic.save') %>">
 <% end %>

data/app/views/shared/_page_header.html.erb

@@ -1,21 +1,21 @@
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
 <%= meta_tag 'ICBM', this_blog.geourl_location if this_blog.geourl_location.present? %>
 <%= meta_tag 'description', @description if @description.present? %>
 <%= meta_tag 'robots', 'noindex, follow' if stop_index_robots?(this_blog) %>
 <%= meta_tag 'google-site-verification', this_blog.google_verification if this_blog.google_verification.present? %>
-<meta name="generator" content="Publify <%= PublifyCore::VERSION %>" />
+<meta name="generator" content="Publify <%= PublifyCore::VERSION %>">
 <%= show_meta_keyword %>
 <% if feed_atom %>
-  <link rel="alternate" type="application/atom+xml" title="Atom" href="<%= feed_atom %>" />
+  <link rel="alternate" type="application/atom+xml" title="Atom" href="<%= feed_atom %>">
 <% end %>
 <% if feed_rss %>
-  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= feed_rss %>" />
+  <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= feed_rss %>">
 <% end %>
 <%= javascript_include_tag :publify, async: Rails.env.production? %>
 <%= csrf_meta_tags %>
 <%= stylesheet_link_tag :publify %>
 <%= page_header_includes %>
-<link rel="canonical" href="<%= this_blog.url_for request.fullpath %>" />
+<link rel="canonical" href="<%= this_blog.url_for request.fullpath %>">
 <%= raw this_blog.custom_tracking_field if this_blog.custom_tracking_field.present? %>
 <%= render 'shared/google_analytics' if this_blog.google_analytics.present? %>
 

data/app/views/tag_sidebar/_content.html.erb

@@ -1,9 +1,9 @@
 <% unless sidebar.tags.blank? %>
   <h3 class="sidebar-title"><%= t('.tags') %></h3>
   <div class="sidebar-body">
-    <p style="overflow:hidden">
+    <p class="tag-sidebar-tag-cloud">
     <% sidebar.tags.each do |tag| %>
-      <span style="font-size:<%= sidebar.sizes[tag] %>%"><%= link_to tag.display_name, tag_url(tag.name) %></span>
+      <span class="tag-sidebar-tag-<%= sidebar.sizes[tag] %>"><%= link_to tag.display_name, tag_url(tag.name) %></span>
     <% end %>
     </p>
   </div>

data/config/locales/ar.yml

@@ -284,7 +284,6 @@ ar:
         compose_new_note: قم بتكوين ملاحظة جديدة
         in_reply_to: في الرد على
         no_notes: لا توجد ملاحظات بعد. هل تريد إنشاء واحد؟
-        now: الآن
         or: أو
         permanent_link: رابط ثابت
         posse_to_twitter: POSSE to Twitter

data/config/locales/da.yml

@@ -246,7 +246,6 @@ da:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/config/locales/de.yml

@@ -246,7 +246,6 @@ de:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/config/locales/en.yml

@@ -246,7 +246,6 @@ en:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/config/locales/es-MX.yml

@@ -246,7 +246,6 @@ es-MX:
         compose_new_note: Componer una nueva nota
         in_reply_to: In reply to
         no_notes: No existen notas aún. Por qué no empieza creando una?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to twitter

data/config/locales/fr.yml

@@ -250,7 +250,6 @@ fr:
         compose_new_note: Écrire un nouveau billet
         in_reply_to: En réponse à
         no_notes: 'Il n''y a pas encore de notes, pourquoi ne pas en créer une ? '
-        now: Maintenant
         or: ou
         permanent_link: Lien permanent
         posse_to_twitter: POSSE to twitter

data/config/locales/he.yml

@@ -245,7 +245,6 @@ he:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/config/locales/it.yml

@@ -246,7 +246,6 @@ it:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/config/locales/ja.yml

@@ -245,7 +245,6 @@ ja:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/config/locales/lt.yml

@@ -258,7 +258,6 @@ lt:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/config/locales/nb.yml

@@ -246,7 +246,6 @@ nb:
         compose_new_note: Skriv nytt notat
         in_reply_to: Som svar på
         no_notes: Det er ingen notater enda. Hva med å opprette en?
-        now: Nå
         or: eller
         permanent_link: Permanent lenke
         posse_to_twitter: POSSE til Twitter

data/config/locales/nl.yml

@@ -246,7 +246,6 @@ nl:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: Er zijn nog geen notes. Waarom maak je er geen?
-        now: Now
         or: or
         permanent_link: Permanente link
         posse_to_twitter: POSSE naar Twitter

data/config/locales/pl.yml

@@ -270,7 +270,6 @@ pl:
         compose_new_note: Utwórz nową notatkę
         in_reply_to: W odpowiedzi do
         no_notes: Brak notatek
-        now: Teraz
         or: lub
         permanent_link: Link
         posse_to_twitter: POSSE to twitter

data/config/locales/pt-BR.yml

@@ -246,7 +246,6 @@ pt-BR:
         compose_new_note: Compor nova nota
         in_reply_to: Em resposta a
         no_notes: Não existem notas ainda. Por que você não inicia e cria uma?
-        now: Agora
         or: ou
         permanent_link: link permanente
         posse_to_twitter: POSSE para twitter

data/config/locales/ro.yml

@@ -258,7 +258,6 @@ ro:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/config/locales/ru.yml

@@ -270,7 +270,6 @@ ru:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: Ничего нет. Почему бы не начать и не добавить?
-        now: Сейчас
         or: или
         permanent_link: Постоянная ссылка
         posse_to_twitter: POSSE to Twitter

data/config/locales/zh-CN.yml

@@ -242,7 +242,6 @@ zh-CN:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: 这儿并不存在Notes。让我们开始创建它。
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to twitter

data/config/locales/zh-TW.yml

@@ -243,7 +243,6 @@ zh-TW:
         compose_new_note: Compose new note
         in_reply_to: In reply to
         no_notes: There are no notes yet. Why don't you create one?
-        now: Now
         or: or
         permanent_link: Permanent link
         posse_to_twitter: POSSE to Twitter

data/db/seeds.rb

@@ -13,9 +13,9 @@
 blog = Blog.first || Blog.create!
 
 unless blog.sidebars.any?
-  PageSidebar.create!(active_position: 0, staged_position: 0, blog_id: blog.id)
-  TagSidebar.create!(active_position: 1, blog_id: blog.id)
-  ArchivesSidebar.create!(active_position: 2, blog_id: blog.id)
-  StaticSidebar.create!(active_position: 3, blog_id: blog.id)
-  MetaSidebar.create!(active_position: 4, blog_id: blog.id)
+  PageSidebar.create!(active_position: 0, staged_position: 0, blog: blog)
+  TagSidebar.create!(active_position: 1, blog: blog)
+  ArchivesSidebar.create!(active_position: 2, blog: blog)
+  StaticSidebar.create!(active_position: 3, blog: blog)
+  MetaSidebar.create!(active_position: 4, blog: blog)
 end

data/lib/publify_core/string_ext.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# FIXME: Replace with helpers and/or methods provided by Rails
+module PublifyCore
+  module StringExt
+    ACCENTS = { %w(á à â ä ã Ã Ä Â À) => "a",
+                %w(é è ê ë Ë É È Ê) => "e",
+                %w(í ì î ï I Î Ì) => "i",
+                %w(ó ò ô ö õ Õ Ö Ô Ò) => "o",
+                ["œ"] => "oe",
+                ["ß"] => "ss",
+                %w(ú ù û ü U Û Ù) => "u",
+                %w(ç Ç) => "c" }.freeze
+
+    def to_permalink
+      string = self
+      ACCENTS.each do |key, value|
+        string = string.tr(key.join, value)
+      end
+      string = string.tr("'", "-")
+      string.gsub(/<[^>]*>/, "").to_url
+    end
+
+    # Returns a-string-with-dashes when passed 'a string with dashes'.
+    # All special chars are stripped in the process
+    def to_url
+      return if nil?
+
+      s = downcase.tr("\"'", "")
+      s = s.gsub(/\P{Word}/, " ")
+      s.strip.tr_s(" ", "-").tr(" ", "-").sub(/^$/, "-")
+    end
+
+    def to_title(item, settings, params)
+      TitleBuilder.new(self).build(item, settings, params)
+    end
+
+    # Strips any html markup from a string
+    TYPO_TAG_KEY = TYPO_ATTRIBUTE_KEY = /[\w:_-]+/.freeze
+    TYPO_ATTRIBUTE_VALUE = /(?:[A-Za-z0-9]+|(?:'[^']*?'|"[^"]*?"))/.freeze
+    TYPO_ATTRIBUTE = /(?:#{TYPO_ATTRIBUTE_KEY}(?:\s*=\s*#{TYPO_ATTRIBUTE_VALUE})?)/.freeze
+    TYPO_ATTRIBUTES = /(?:#{TYPO_ATTRIBUTE}(?:\s+#{TYPO_ATTRIBUTE})*)/.freeze
+    TAG =
+      %r{<[!/?\[]?(?:#{TYPO_TAG_KEY}|--)(?:\s+#{TYPO_ATTRIBUTES})?\s*(?:[!/?\]]+|--)?>}
+        .freeze
+    def strip_html
+      gsub(TAG, "").gsub(/\s+/, " ").strip
+    end
+  end
+end
+
+String.include PublifyCore::StringExt

data/lib/publify_core/testing_support/feed_assertions.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "feedjira"
-require "rexml/document"
 
 module PublifyCore
   module TestingSupport
@@ -9,9 +8,7 @@ module PublifyCore
       # TODO: Clean up use of these Test::Unit style expectations
       def assert_xml(xml)
         expect(xml).not_to be_empty
-        expect do
-          assert REXML::Document.new(xml)
-        end.not_to raise_error
+        expect { Nokogiri::XML.parse(xml) }.not_to raise_error
       end
 
       def assert_atom10(feed, count)

data/lib/publify_core/text_filter/markdown.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "text_filter_plugin"
+require "commonmarker"
+
+module PublifyCore::TextFilter
+  class Markdown < TextFilterPlugin::Markup
+    plugin_display_name "Markdown"
+    plugin_description "Markdown markup language from" \
+                       ' <a href="http://daringfireball.com/">Daring Fireball</a>'
+
+    def self.help_text
+      <<~TXT
+        [Markdown](http://daringfireball.net/projects/markdown/) is a simple
+        text-to-HTML converter that turns common text idioms into HTML.  The
+        [full syntax](http://daringfireball.net/projects/markdown/syntax) is
+        available from the author's site, but here's a short summary:
+
+        * **Paragraphs**: Start a new paragraph by skipping a line.
+        * **Italics**: Put text in *italics* by enclosing it in either * or
+          _: `*italics*` turns into *italics*.
+        * **Bold**: Put text in **bold** by enclosing it in two *s:
+          `**bold**` turns into **bold**.
+        * **Pre-formatted text**: Enclosing a short block of text in
+          backquotes (&#96;) displays it in a monospaced font and converts HTML
+          metacharacters so they display correctly.  Example:
+          &#96;`<img src="foo"/>`&#96; displays as `<img src="foo"/>`. Also,
+          any paragraph indented 4 or more spaces is treated as pre-formatted
+          text.
+        * **Block quotes**: Any paragraph (or line) that starts with a `>` is
+          treated as a blockquote.
+        * **Hyperlinks**: You can create links like this:
+          `[amazon's web site](http://www.amazon.com)`. That produces
+          "[amazon's web site](http://www.amazon.com)".
+        * **Lists**: You can create numbered or bulleted lists by ending a
+          paragraph with a colon (:), skipping a line, and then using asterisks
+          (*, for bullets) or numbers (for numbered lists).  See the
+          [Markdown syntax page](http://daringfireball.net/projects/markdown/syntax)
+          for examples.
+        * **Raw HTML**: Markdown will pass raw HTML through unchanged, so you
+          can use HTML's syntax whenever Markdown doesn't provide a reasonable
+          alternative.
+      TXT
+    end
+
+    def self.filtertext(text)
+      # FIXME: Workaround for <publify:foo> not being interpreted as an HTML tag.
+      escaped_macros = text.gsub(%r{(</?publify):}, '\1X')
+      html = CommonMarker.render_html(escaped_macros, :UNSAFE)
+      html.gsub(%r{(</?publify)X}, '\1:').strip
+    end
+  end
+end

data/lib/{publify_textfilter_markdown_smartquotes.rb → publify_core/text_filter/markdown_smartquotes.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require "text_filter_plugin"
-require "publify_textfilter_markdown"
+require "publify_core/text_filter/markdown"
 
-module PublifyTextfilter
-  class MarkdownSmartquotes < PublifyApp::Textfilter::Markdown
+module PublifyCore::TextFilter
+  class MarkdownSmartquotes < PublifyCore::TextFilter::Markdown
     plugin_display_name "Markdown with smart quotes"
     plugin_description "Markdown markup language from" \
                        ' <a href="http://daringfireball.com/">Daring Fireball</a>' \

data/lib/publify_core/text_filter/none.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "text_filter_plugin"
+
+module PublifyCore::TextFilter
+  class None < TextFilterPlugin::Markup
+    plugin_display_name "None"
+    plugin_description "Raw HTML only"
+
+    def self.filtertext(text)
+      text
+    end
+  end
+end

data/lib/publify_core/text_filter/smartypants.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "rubypants"
+
+module PublifyCore::TextFilter
+  class Smartypants < TextFilterPlugin::PostProcess
+    plugin_display_name "Smartypants"
+    plugin_description "Converts HTML to use typographically correct quotes and dashes"
+
+    def self.filtertext(text)
+      RubyPants.new(text).to_html
+    end
+  end
+end

data/lib/publify_core/text_filter/twitterfilter.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "text_filter_plugin"
+require "html/pipeline"
+require "html/pipeline/hashtag/hashtag_filter"
+
+module PublifyCore::TextFilter
+  class Twitterfilter < TextFilterPlugin::PostProcess
+    plugin_display_name "Twitter Filter"
+    plugin_description "Convert hashtags and mentions to links"
+
+    class TwitterHashtagFilter < HTML::Pipeline::HashtagFilter
+      def initialize(text)
+        super(text,
+              tag_url: "https://twitter.com/search?q=%%23%<tag>s&src=tren&mode=realtime",
+              tag_link_attr: "")
+      end
+    end
+
+    class TwitterMentionFilter < HTML::Pipeline::MentionFilter
+      def initialize(text)
+        super(text, base_url: "https://twitter.com")
+      end
+
+      # Override base mentions finder, treating @mention just like any other @foo.
+      def self.mentioned_logins_in(text, username_pattern = UsernamePattern)
+        text.gsub MentionPatterns[username_pattern] do |match|
+          login = Regexp.last_match(1)
+          yield match, login, false
+        end
+      end
+
+      # Override base link creator, removing the class
+      def link_to_mentioned_user(login)
+        result[:mentioned_usernames] |= [login]
+
+        url = base_url.dup
+        url << "/" unless %r{[/~]\z}.match?(url)
+
+        "<a href='#{url << login}'>" \
+          "@#{login}" \
+          "</a>"
+      end
+    end
+
+    def self.filtertext(text)
+      # First, autolink
+      helper = PublifyCore::ContentTextHelpers.new
+      text = helper.auto_link(text)
+
+      text = TwitterHashtagFilter.new(text).call
+      TwitterMentionFilter.new(text).call.to_s
+    end
+  end
+end

data/lib/publify_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PublifyCore
-  VERSION = "10.0.0"
+  VERSION = "10.0.2"
 end

data/lib/publify_core.rb

@@ -8,6 +8,12 @@ require "publify_core/version"
 require "publify_core/engine"
 require "publify_core/lang"
 require "publify_core/content_text_helpers"
+require "publify_core/text_filter/none"
+require "publify_core/text_filter/markdown"
+require "publify_core/text_filter/markdown_smartquotes"
+require "publify_core/text_filter/smartypants"
+require "publify_core/text_filter/twitterfilter"
+require "publify_core/string_ext"
 
 require "carrierwave"
 require "jquery-rails"
@@ -20,17 +26,11 @@ require "sassc-rails"
 
 require "email_notify"
 require "publify_guid"
-require "publify_textfilter_none"
-require "publify_textfilter_markdown"
-require "publify_textfilter_markdown_smartquotes"
-require "publify_textfilter_smartypants"
-require "publify_textfilter_twitterfilter"
 require "publify_time"
 require "sidebar_registry"
 require "spam_protection"
 require "text_filter_plugin"
 require "theme"
-require "transforms"
 
 module PublifyCore
   Theme.register_themes File.join(Engine.root, "themes")

data/lib/text_filter_plugin.rb

@@ -13,10 +13,8 @@ class TextFilterPlugin
   def self.inherited(sub)
     super
 
-    if sub.to_s.start_with?("Plugin", "PublifyTextfilter", "PublifyApp::Textfilter")
-      name = sub.short_name
-      @@filter_map[name] = sub
-    end
+    name = sub.short_name
+    @@filter_map[name] = sub
   end
 
   def self.filter_map
@@ -116,34 +114,40 @@ class TextFilterPlugin
   def self.logger
     @logger ||= ::Rails.logger || Logger.new($stdout)
   end
+
+  def self.abstract_filter!
+    @@filter_map.delete short_name
+  end
 end
 
 class TextFilterPlugin::PostProcess < TextFilterPlugin
+  abstract_filter!
+
   def self.filter_type
     "postprocess"
   end
 end
 
-class TextFilterPlugin::Macro < TextFilterPlugin
+module TextFilterPlugin::MacroMethods
   # Utility function -- hand it a XML string like <a href="foo" title="bar">
   # and it'll give you back { "href" => "foo", "title" => "bar" }
-  def self.attributes_parse(string)
+  def attributes_parse(string)
     attributes = {}
 
     string.gsub(/([^ =]+="[^"]*")/) do |match|
-      key, value = match.split(/=/, 2)
+      key, value = match.split("=", 2)
       attributes[key] = value.delete('"')
     end
 
     string.gsub(/([^ =]+='[^']*')/) do |match|
-      key, value = match.split(/=/, 2)
+      key, value = match.split("=", 2)
       attributes[key] = value.delete("'")
     end
 
     attributes
   end
 
-  def self.filtertext(text)
+  def filtertext(text)
     regex1 = %r{<publify:#{short_name}(?:[ \t][^>]*)?/>}
     regex2 = %r{<publify:#{short_name}([ \t][^>]*)?>(.*?)</publify:#{short_name}>}m
 
@@ -157,19 +161,27 @@ class TextFilterPlugin::Macro < TextFilterPlugin
   end
 end
 
-class TextFilterPlugin::MacroPre < TextFilterPlugin::Macro
+class TextFilterPlugin::MacroPre < TextFilterPlugin
+  abstract_filter!
+  extend TextFilterPlugin::MacroMethods
+
   def self.filter_type
     "macropre"
   end
 end
 
-class TextFilterPlugin::MacroPost < TextFilterPlugin::Macro
+class TextFilterPlugin::MacroPost < TextFilterPlugin
+  abstract_filter!
+  extend TextFilterPlugin::MacroMethods
+
   def self.filter_type
     "macropost"
   end
 end
 
 class TextFilterPlugin::Markup < TextFilterPlugin
+  abstract_filter!
+
   def self.filter_type
     "markup"
   end