kramdown-man 0.1.3 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 164ce0fc23aa69a61fb65b7c99d26e76a9ab76fc798962f06940412bb1dcbcfd
+  data.tar.gz: 2161ba26365fe958c5a0b5f063706dfe7566d9c1213cb6f84bc63b50dfae4030
+SHA512:
+  metadata.gz: 54bd2ea4c4b967a5af505900f6ea8f02edb00900f6e5e6d67d1c015e776e602fe81d1dc641c62f2d7b614fecb224b3cc6003330b38eaa322f80b7296ee96850c
+  data.tar.gz: 28a7d09d3e41e9f108c2a73e966d9ecf31a4343b98b4452c23eab9978b7af77f8ec63a2b870726bb2c39cd0ecd0490fd922ea4e389716c4863fb68fe02dafa3e

data/.github/workflows/ruby.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: ['**']
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+          - jruby
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: bundle install --jobs 4 --retry 3
+      - name: Run tests
+        run: bundle exec rake test

data/.gitignore

@@ -1,2 +1,3 @@
+Gemfile.lock
 doc/
 pkg/

data/ChangeLog.md

@@ -1,3 +1,32 @@
+### 0.1.8 / 2020-12-26
+
+* Upgrade to kramdown 2.x.
+
+### 0.1.7 / 2020-07-22
+
+* Fixed a bug where kramdown's version of `kramdown/converter/man` was being
+  loaded instead of kramdown-man's version.
+
+### 0.1.6 / 2015-12-25
+
+* Commented out duplicate Hash entries that were causing warnings.
+
+### 0.1.5 / 2013-05-19
+
+* Translate unicode symbols into roff glyphs.
+* Convert typographic symbols and smart quotes into glyphs.
+* Simplify `\fB\fC` as `\fC` (Colin Watson).
+* Use `\fB` for codespans (Colin Watson).
+* Escape `--` as `\-\-` (Colin Watson).
+* Escape `\` as `\e` (Colin Watson).
+* Emit `.TP` or `.HP` if the paragraph begins with a strong element.
+
+### 0.1.4 / 2013-05-05
+
+* Improve detection of tagged paragraphs.
+* Support emitted a hanging paragraph (`.HP`) for command synopsis lines.
+* Strip leading whitespace from each line of emitted text.
+
 ### 0.1.3 / 2013-05-05
 
 * Initial release:

data/Gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org/'
+
+gemspec
+
+group :development do
+  gem 'rake'
+  gem 'rubygems-tasks', '~> 0.2'
+  gem 'rspec', '~> 3.0'
+  gem 'yard', '~> 0.9'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Hal Brodigan
+Copyright (c) 2013-2020 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,8 +5,6 @@
 * [Documentation](http://rubydoc.info/gems/kramdown-man/frames)
 * [Email](mailto:postmodern.mod3 at gmail.com)
 
-[![Build Status](https://secure.travis-ci.org/postmodern/kramdown-man.png?branch=master)](https://travis-ci.org/postmodern/kramdown-man)
-
 ## Description
 
 A [Kramdown][kramdown] convert for converting Markdown files into man pages.
@@ -15,14 +13,14 @@ A [Kramdown][kramdown] convert for converting Markdown files into man pages.
 
 * Converts markdown to [roff]:
   * Supports codespans, emphasis and strong fonts.
-  * Supports normal and tagged paragraphs.
+  * Supports normal, hanging and tagged paragraphs.
   * Supports bullet lists.
   * Supports multi-paragraph list items and blockquotes.
   * Supports horizontal rules.
   * Supports converting `[bash](man:bash(1))` links into man page references.
 * Provides Rake task for converting `man/*.md` into man pages.
 * Uses the pure-Ruby [Kramdown][kramdown] markdown parser.
-* Supports [Ruby] 1.8.x, 1.9.x, 2.0.x, [JRuby], [Rubinius].
+* Supports [Ruby] 2.0 and [JRuby].
 
 ## Synopsis
 
@@ -69,6 +67,10 @@ Define a `man` and file tasks which render all `*.md` files within the
 
 Normal paragraph.
 
+    `command` [`--foo`] *FILE*
+
+`command` [`--foo`] *FILE*
+
     `--tagged`
       Text here.
 
@@ -152,7 +154,7 @@ Email <bob@example.com>
 
 ## Requirements
 
-* [kramdown] ~> 1.0
+* [kramdown] ~> 2.0
 
 ## Install
 
@@ -166,13 +168,12 @@ Email <bob@example.com>
 
 ## Copyright
 
-Copyright (c) 2013 Hal Brodigan
+Copyright (c) 2013-2020 Hal Brodigan
 
 See {file:LICENSE.txt} for details.
 
-[kramdown]: http://kramdown.rubyforge.org/
+[kramdown]: http://kramdown.gettalong.org/
 [roff]: http://en.wikipedia.org/wiki/Roff
 
 [Ruby]: http://www.ruby-lang.org/
 [JRuby]: http://jruby.org/
-[Rubinius]: http://rubini.us/

data/Rakefile

@@ -1,45 +1,23 @@
 # encoding: utf-8
 
-require 'rubygems'
-require 'rake'
-
 begin
-  gem 'rubygems-tasks', '~> 0.2'
-  require 'rubygems/tasks'
-
-  Gem::Tasks.new
-rescue LoadError => e
-  warn e.message
-  warn "Run `gem install rubygems-tasks` to install Gem::Tasks."
+  require 'bundler/setup'
+rescue LoadError => error
+  abort error.message
 end
 
-begin
-  gem 'rspec', '~> 2.4'
-  require 'rspec/core/rake_task'
-
-  RSpec::Core::RakeTask.new
-rescue LoadError => e
-  task :spec do
-    abort "Please run `gem install rspec` to install RSpec."
-  end
-end
+require 'rake'
+require 'rubygems/tasks'
+Gem::Tasks.new
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
 task :test    => :spec
 task :default => :spec
 
-begin
-  gem 'yard', '~> 0.8'
-  require 'yard'
-
-  YARD::Rake::YardocTask.new  
-rescue LoadError => e
-  task :yard do
-    abort "Please run `gem install yard` to install YARD."
-  end
-end
+require 'yard'
+YARD::Rake::YardocTask.new  
 task :doc => :yard
 
-$LOAD_PATH.unshift(File.expand_path('lib'))
-
-require 'kramdown/man/tasks'
-Kramdown::Man::Tasks.new
+require 'kramdown/man/task'
+Kramdown::Man::Task.new

data/gemspec.yml

@@ -7,9 +7,7 @@ email: postmodern.mod3@gmail.com
 homepage: https://github.com/postmodern/kramdown-man#readme
 
 dependencies:
-  kramdown: ~> 1.0
+  kramdown: ~> 2.0
 
 development_dependencies:
-  rspec: ~> 2.4
-  rubygems-tasks: ~> 0.2
-  yard: ~> 0.8
+  bundler: ~> 2.0

data/lib/kramdown/converter/man.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'kramdown/man/version'
+require_relative '../man/version'
 
 require 'kramdown/converter/base'
 
@@ -8,33 +8,399 @@ module Kramdown
     #
     # Converts markdown into a roff man-page.
     #
-    class Man < Base
+    class Man < ::Kramdown::Converter::Base
 
       # Comment header
       HEADER = [
         ".\\\" Generated by kramdown-man #{::Kramdown::Man::VERSION}",
-        ".\\\" https://github.com/postmodern/kramdown-roff#readme"
+        ".\\\" https://github.com/postmodern/kramdown-man#readme"
       ].join("\n")
 
       # Typographic Symbols and their UTF8 chars
       TYPOGRAPHIC_SYMS = {
-        :ndash       => "--",
-        :mdash       => "—",
-        :hellip      => "…",
-        :laquo       => "«",
-        :raquo       => "»",
-        :laquo_space => "«",
-        :raquo_space => "»"
+        :ndash       => '\-\-',
+        :mdash       => '\[em]',
+        :hellip      => '\.\.\.',
+        :laquo       => '\[Fo]',
+        :raquo       => '\[Fc]',
+        :laquo_space => '\[Fo]',
+        :raquo_space => '\[Fc]'
       }
 
       # Smart Quotes and their UTF8 chars
       SMART_QUOTES = {
-        :lsquo => "‘",
-        :rsquo => "’",
-        :ldquo => "“",
-        :rdquo => "”"
+        :lsquo => '\[oq]',
+        :rsquo => '\[cq]',
+        :ldquo => '\[lq]',
+        :rdquo => '\[rq]'
       }
 
+      GLYPHS = {
+        'Ð' => '\[-D]',
+        'ð' => '\[Sd]',
+        'Þ' => '\[TP]',
+        'þ' => '\[Tp]',
+        'ß' => '\[ss]',
+        # Ligatures and Other Latin Glyphs
+        'ff' => '\[ff]',
+        'fi' => '\[fi]',
+        'fl' => '\[fl]',
+        'ffi' => '\[Fi]',
+        'ffl' => '\[Fl]',
+        'Ł' => '\[/L]',
+        'ł' => '\[/l]',
+        'Ø' => '\[/O]',
+        'ø' => '\[/o]',
+        'Æ' => '\[AE]',
+        'æ' => '\[ae]',
+        'Œ' => '\[OE]',
+        'œ' => '\[oe]',
+        'IJ' => '\[IJ]',
+        'ij' => '\[ij]',
+        'ı' => '\[.i]',
+        'ȷ' => '\[.j]',
+        # Accented Characters
+        'Á' => '\[\'A]',
+        'Ć' => '\[\'C]',
+        'É' => '\[\'E]',
+        'Í' => '\[\'I]',
+        'Ó' => '\[\'O]',
+        'Ú' => '\[\'U]',
+        'Ý' => '\[\'Y]',
+        'á' => '\[\'a]',
+        'ć' => '\[\'c]',
+        'é' => '\[\'e]',
+        'í' => '\[\'i]',
+        'ó' => '\[\'o]',
+        'ú' => '\[\'u]',
+        'ý' => '\[\'y]',
+        'Ä' => '\[:A]',
+        'Ë' => '\[:E]',
+        'Ï' => '\[:I]',
+        'Ö' => '\[:O]',
+        'Ü' => '\[:U]',
+        'Ÿ' => '\[:Y]',
+        'ä' => '\[:a]',
+        'ë' => '\[:e]',
+        'ï' => '\[:i]',
+        'ö' => '\[:o]',
+        'ü' => '\[:u]',
+        'ÿ' => '\[:y]',
+        'Â' => '\[^A]',
+        'Ê' => '\[^E]',
+        'Î' => '\[^I]',
+        'Ô' => '\[^O]',
+        'Û' => '\[^U]',
+        'â' => '\[^a]',
+        'ê' => '\[^e]',
+        'î' => '\[^i]',
+        'ô' => '\[^o]',
+        'û' => '\[^u]',
+        'À' => '\[`A]',
+        'È' => '\[`E]',
+        'Ì' => '\[`I]',
+        'Ò' => '\[`O]',
+        'Ù' => '\[`U]',
+        'à' => '\[`a]',
+        'è' => '\[`e]',
+        'ì' => '\[`i]',
+        'ò' => '\[`o]',
+        'ù' => '\[`u]',
+        'Ã' => '\[~A]',
+        'Ñ' => '\[~N]',
+        'Õ' => '\[~O]',
+        'ã' => '\[~a]',
+        'ñ' => '\[~n]',
+        'õ' => '\[~o]',
+        'Š' => '\[vS]',
+        'š' => '\[vs]',
+        'Ž' => '\[vZ]',
+        'ž' => '\[vz]',
+        'Ç' => '\[,C]',
+        'ç' => '\[,c]',
+        'Å' => '\[oA]',
+        'å' => '\[oa]',
+        # Accents
+        '˝' => '\[a"]',
+        '¯' => '\[a-]',
+        '˙' => '\[a.]',
+        # '^' => '\[a^]',
+        '´' => "\\´",
+        '`' => '\`',
+        '˘' => '\[ab]',
+        '¸' => '\[ac]',
+        '¨' => '\[ad]',
+        'ˇ' => '\[ah]',
+        '˚' => '\[ao]',
+        # '~' => '\(ti',
+        '˛' => '\[ho]',
+        '^' => '\(ha',
+        '~' => '\[ti]',
+        # Quotes
+        '„' => '\[Bq]',
+        '‚' => '\[bq]',
+        '“' => '\[lq]',
+        '”' => '\[rq]',
+        '‘' => '\[oq]',
+        '’' => '\[cq]',
+        "'" => '\(aq',
+        '"' => '\[dq]',
+        '«' => '\[Fo]',
+        '»' => '\[Fc]',
+        '‹' => '\[fo]',
+        '›' => '\[fc]',
+        # Punctuation
+        '.' => '\.',
+        '¡' => '\[r!]',
+        '¿' => '\[r?]',
+        '—' => '\[em]',
+        '–' => '\[en]',
+        '‐' => '\[hy]',
+        # Brackets
+        '[' => '\[lB]',
+        ']' => '\[rB]',
+        '{' => '\[lC]',
+        '}' => '\[rC]',
+        '⟨' => '\[la]',
+        '⟩' => '\[ra]',
+        # '⎪' => '\[bv]',
+        # '⎪' => '\[braceex]',
+        '⎡' => '\[bracketlefttp]',
+        '⎣' => '\[bracketleftbt]',
+        '⎢' => '\[bracketleftex]',
+        '⎤' => '\[bracketrighttp]',
+        '⎦' => '\[bracketrightbt]',
+        '⎥' => '\[bracketrightex]',
+        '╭' => '\[lt]',
+        '⎧' => '\[bracelefttp]',
+        '┥' => '\[lk]',
+        '⎨' => '\[braceleftmid]',
+        '╰' => '\[lb]',
+        '⎩' => '\[braceleftbt]',
+        # '⎪' => '\[braceleftex]',
+        '╮' => '\[rt]',
+        '⎫' => '\[bracerighttp]',
+        '┝' => '\[rk]',
+        '⎬' => '\[bracerightmid]',
+        '╯' => '\[rb]',
+        '⎭' => '\[bracerightbt]',
+        '⎪' => '\[bracerightex]',
+        '⎛' => '\[parenlefttp]',
+        '⎝' => '\[parenleftbt]',
+        '⎜' => '\[parenleftex]',
+        '⎞' => '\[parenrighttp]',
+        '⎠' => '\[parenrightbt]',
+        '⎟' => '\[parenrightex]',
+        # Arrows
+        '←' => '\[<-]',
+        '→' => '\[->]',
+        '↔' => '\[<>]',
+        '↓' => '\[da]',
+        '↑' => '\[ua]',
+        '↕' => '\[va]',
+        '⇐' => '\[lA]',
+        '⇒' => '\[rA]',
+        '⇔' => '\[hA]',
+        '⇓' => '\[dA]',
+        '⇑' => '\[uA]',
+        '⇕' => '\[vA]',
+        '⎯' => '\[an]',
+        # Lines
+        # '|' => '\[ba]',
+        '│' => '\[br]',
+        # '_' => '\[ul]',
+        '‾' => '\[rn]',
+        '_' => '\[ru]',
+        '¦' => '\[bb]',
+        '/' => '\[sl]',
+        '\\' => '\e',
+        # Text markers
+        '○' => '\[ci]',
+        # '·' => '\[bu]',
+        '‡' => '\[dd]',
+        '†' => '\[dg]',
+        '◊' => '\[lz]',
+        '□' => '\[sq]',
+        '¶' => '\[ps]',
+        '§' => '\[sc]',
+        '☜' => '\[lh]',
+        '☞' => '\[rh]',
+        '@' => '\[at]',
+        '#' => '\[sh]',
+        '↵' => '\[CR]',
+        '✓' => '\[OK]',
+        # Legal Symbols
+        '©' => '\[co]',
+        '®' => '\[rg]',
+        '™' => '\[tm]',
+        # Currency symbols
+        '$' => '\[Do]',
+        '¢' => '\[ct]',
+        # '€' => '\[eu]',
+        '€' => '\[Eu]',
+        '¥' => '\[Ye]',
+        '£' => '\[Po]',
+        '¤' => '\[Cs]',
+        'ƒ' => '\[Fn]',
+        # Units
+        '°' => '\[de]',
+        '‰' => '\[%0]',
+        '′' => '\[fm]',
+        '″' => '\[sd]',
+        'µ' => '\[mc]',
+        'ª' => '\[Of]',
+        'º' => '\[Om]',
+        # Logical Symbols
+        '∧' => '\[AN]',
+        '∨' => '\[OR]',
+        # '¬' => '\[no]',
+        '¬' => '\[tno]',
+        '∃' => '\[te]',
+        '∀' => '\[fa]',
+        '∋' => '\[st]',
+        # '∴' => '\[3d]',
+        '∴' => '\[tf]',
+        '|' => '\[or]',
+        # Mathematical Symbols
+        '½' => '\[12]',
+        '¼' => '\[14]',
+        '¾' => '\[34]',
+        '⅛' => '\[18]',
+        '⅜' => '\[38]',
+        '⅝' => '\[58]',
+        '⅞' => '\[78]',
+        '¹' => '\[S1]',
+        '²' => '\[S2]',
+        '³' => '\[S3]',
+        '+' => '\[pl]',
+        '-' => '\-',
+        '−' => '\[mi]',
+        '∓' => '\[-+]',
+        # '±' => '\[+-]',
+        '±' => '\[t+-]',
+        '·' => '\[pc]',
+        '⋅' => '\[md]',
+        # '×' => '\[mu]',
+        '×' => '\[tmu]',
+        '⊗' => '\[c*]',
+        '⊕' => '\[c+]',
+        # '÷' => '\[di]',
+        '÷' => '\[tdi]',
+        '⁄' => '\[f/]',
+        '∗' => '\[**]',
+        '≤' => '\[<=]',
+        '≥' => '\[>=]',
+        '≪' => '\[<<]',
+        '≫' => '\[>>]',
+        '=' => '\[eq]',
+        '≠' => '\[!=]',
+        '≡' => '\[==]',
+        '≢' => '\[ne]',
+        '≅' => '\[=~]',
+        '≃' => '\[|=]',
+        '∼' => '\[ap]',
+        # '≈' => '\[~~]',
+        '≈' => '\[~=]',
+        '∝' => '\[pt]',
+        '∅' => '\[es]',
+        '∈' => '\[mo]',
+        '∉' => '\[nm]',
+        '⊂' => '\[sb]',
+        '⊄' => '\[nb]',
+        '⊃' => '\[sp]',
+        '⊅' => '\[nc]',
+        '⊆' => '\[ib]',
+        '⊇' => '\[ip]',
+        '∩' => '\[ca]',
+        '∪' => '\[cu]',
+        '∠' => '\[/_]',
+        '⊥' => '\[pp]',
+        # '∫' => '\[is]',
+        '∫' => '\[integral]',
+        '∑' => '\[sum]',
+        '∏' => '\[product]',
+        '∐' => '\[coproduct]',
+        '∇' => '\[gr]',
+        # '√' => '\[sr]',
+        '√' => '\[sqrt]',
+        '⌈' => '\[lc]',
+        '⌉' => '\[rc]',
+        '⌊' => '\[lf]',
+        '⌋' => '\[rf]',
+        '∞' => '\[if]',
+        'ℵ' => '\[Ah]',
+        'ℑ' => '\[Im]',
+        'ℜ' => '\[Re]',
+        '℘' => '\[wp]',
+        '∂' => '\[pd]',
+        # 'ℏ' => '\[-h]',
+        'ℏ' => '\[hbar]',
+        # Greek glyphs
+        'Α' => '\[*A]',
+        'Β' => '\[*B]',
+        'Γ' => '\[*G]',
+        'Δ' => '\[*D]',
+        'Ε' => '\[*E]',
+        'Ζ' => '\[*Z]',
+        'Η' => '\[*Y]',
+        'Θ' => '\[*H]',
+        'Ι' => '\[*I]',
+        'Κ' => '\[*K]',
+        'Λ' => '\[*L]',
+        'Μ' => '\[*M]',
+        'Ν' => '\[*N]',
+        'Ξ' => '\[*C]',
+        'Ο' => '\[*O]',
+        'Π' => '\[*P]',
+        'Ρ' => '\[*R]',
+        'Σ' => '\[*S]',
+        'Τ' => '\[*T]',
+        'Υ' => '\[*U]',
+        'Φ' => '\[*F]',
+        'Χ' => '\[*X]',
+        'Ψ' => '\[*Q]',
+        'Ω' => '\[*W]',
+        'α' => '\[*a]',
+        'β' => '\[*b]',
+        'γ' => '\[*g]',
+        'δ' => '\[*d]',
+        'ε' => '\[*e]',
+        'ζ' => '\[*z]',
+        'η' => '\[*y]',
+        'θ' => '\[*h]',
+        'ι' => '\[*i]',
+        'κ' => '\[*k]',
+        'λ' => '\[*l]',
+        'μ' => '\[*m]',
+        'ν' => '\[*n]',
+        'ξ' => '\[*c]',
+        'ο' => '\[*o]',
+        'π' => '\[*p]',
+        'ρ' => '\[*r]',
+        'ς' => '\[ts]',
+        'σ' => '\[*s]',
+        'τ' => '\[*t]',
+        'υ' => '\[*u]',
+        'ϕ' => '\[*f]',
+        'χ' => '\[*x]',
+        'ψ' => '\[*q]',
+        'ω' => '\[*w]',
+        'ϑ' => '\[+h]',
+        'φ' => '\[+f]',
+        'ϖ' => '\[+p]',
+        'ϵ' => '\[+e]',
+        # Card symbols
+        '♣' => '\[CL]',
+        '♠' => '\[SP]',
+        '♥' => '\[HE]',
+        '♡' => '\[u2661]',
+        '♦' => '\[DI]',
+        '♢' => '\[u2662]'
+      }
+
+      # Regular expression to convert unicode characters into glyphs
+      GLYPH_REGEXP = Regexp.union(GLYPHS.keys)
+
       #
       # Initializes the converter.
       #
@@ -115,7 +481,7 @@ module Kramdown
       #   The roff output.
       #
       def convert_text(text)
-        escape(text.value)
+        escape(text.value.gsub(/^(  +|\t)/,''))
       end
 
       #
@@ -324,15 +690,21 @@ module Kramdown
       def convert_p(p)
         children = p.children
 
-        if (children.length >= 2) &&
-           (children[0].type == :em   || children[0].type == :codespan) &&
-           (children[1].type == :text && children[1].value =~ /^(  |\t)/)
-          [
-            '.TP',
-            convert_element(children[0]),
-            convert_text(children[1]).lstrip,
-            convert_children(children[2..-1])
-          ].join("\n").rstrip
+        if ((children.length >= 2) && (children.first.type == :codespan ||
+                                       children.first.type == :em       ||
+                                       children.first.type == :strong))
+          newline = children.find_index { |el|
+            el.type == :text && el.value.start_with?("\n")
+          }
+
+          if newline
+            first_line = convert_children(children[0...newline])
+            rest       = convert_children(children[newline..-1]).strip
+
+            ".TP\n#{first_line}\n#{rest}"
+          else
+            ".HP\n#{convert_children(children)}"
+          end
         else
           ".PP\n#{convert_children(children)}"
         end
@@ -374,7 +746,7 @@ module Kramdown
       #   The roff output.
       #
       def convert_codespan(codespan)
-        "\\fB\\fC#{codespan.value}\\fR"
+        "\\fB#{codespan.value}\\fR"
       end
 
       #
@@ -387,7 +759,7 @@ module Kramdown
       #   The roff output.
       #
       def convert_a(a)
-        href = a.attr['href']
+        href = escape(a.attr['href'])
         text = convert_children(a.children)
 
         case href
@@ -431,7 +803,7 @@ module Kramdown
       #   The escaped text.
       #
       def escape(text)
-        text.gsub('\\','\&\&').gsub('-','\\-')
+        text.gsub(GLYPH_REGEXP) { |char| GLYPHS[char] }
       end
 
     end