kramdown 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGVjNDY0Nzc3OTdiZjA1Yzg2MTEwZWJjMGE2NjllNjJiYzk4OTk5OQ==
+    MTMyMzYyMTE4OTYwNDRjYzdkMDZjN2M3NWY2MTE4ZmMwYjE4Mzc2OQ==
   data.tar.gz: !binary |-
-    NzNlYWRiNGEyZjg2OTA0ZjA2Zjk3MmFlYTRkYzk4ZTBjNmE2ZTc0OQ==
+    ODQyZDZkMjc5ZjNlNTA1MjcxZjFmZTgzZTMyOTRhMmVmYzE1NjFkYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGRmZGQ1NjUwOWNlYzM0NjIyZDczNTliYWE0OGM1NjQwYTdkN2VkY2Y4MDIz
-    YTMwZjE1ZTYyNDAyNDlkZTc2ZjdhZDJjNWVlYmZiZTFlZTRkMzE0MjZhMmM1
-    ZDljMzJkNzQyZGM4NzFiMDQ3MTIwMjBhZWRkOTg0ZjhiNjAwNjI=
+    ZGE2YTZlNzUwMjE3ZTAyOGU1MGYwOWRlMjU5NmQ0NTJkNDc0Mjg3NGE3MjBh
+    MzkxMDIzNzU4MjE0ZTZlMjJjMWNiYWFkY2M3NmMxNjYyMzQwMmNiMTQ0YmE0
+    MDUwNDI3MGIzYWNjNGZlOGE4MzBhMDIxN2NiZWFjMmJjM2Q5Zjg=
   data.tar.gz: !binary |-
-    ZDg2ZDA4MDc2ZjMxYmZlNzk4NDk4YzI4MTM5ZTAyZjYwNTk4ZTNmNjFjNGE2
-    ZmEyZDU4OTRiYjc2MjU4NTEyZTAwMTA0MTJiNGI2NmNmNGRjZDFlMDI3M2Nl
-    Y2RhZmJiNDBkZTM0ZjMzYzk2N2U3YmViNDVkY2YxMjE2MDJlNDg=
+    MDFkOGYxZjg5NjRmM2JlMTEzZDQ4ZTgxYmU3N2M4Y2Y1MGM5MDVkMGMwM2Y4
+    YzRmYWQ2YzFlZjMxNzIxYmY4ZGE5YzJiZTc0N2M4YzI5MGIxOGM4NGMxMjZk
+    OTVhMDRlN2YzMWNlOGUxMGE3MjE5Y2Q1Y2FiMzdlMTMzZGE2M2Y=

data/CONTRIBUTERS

@@ -1,6 +1,6 @@
   Count Name
 ======= ====
-    571 Thomas Leitner <t_leitner@gmx.at>
+    576 Thomas Leitner <t_leitner@gmx.at>
       6 Gioele Barabucci <gioele@svario.it>
       3 gettalong <t_leitner@gmx.at>
       3 Ben Armston <ben.armston@googlemail.com>

data/Rakefile

@@ -181,6 +181,7 @@ EOF
       s.executables = ['kramdown']
       s.default_executable = 'kramdown'
       s.add_development_dependency 'coderay', '~> 1.0.0'
+      s.add_development_dependency 'stringex', '~> 1.5.1'
 
       #### Documentation
 
@@ -236,7 +237,7 @@ EOF
       rf.configure
       rf.login
 
-      content = REL_PAGE.blocks['content']
+      content = REL_PAGE.blocks['content'].content.force_encoding('ASCII-8BIT')
       content += "\n\n\nAbout kramdown\n\n#{SUMMARY}\n\n#{DESCRIPTION}"
       rf.post_news('kramdown', "kramdown #{Kramdown::VERSION} released", content)
       puts "done"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/doc/default.scss.css

@@ -11,6 +11,7 @@ aside a {
     &:hover {
         text-decoration: underline;
     }
+
 }
 
 #content {
@@ -179,3 +180,9 @@ acronym {
 .clear {
     clear: both;
 }
+
+.inline-important {
+    font-weight: bold;
+    display: block;
+    text-align: center;
+}

data/doc/sidebar.template

@@ -1,7 +1,7 @@
 <h2>News</h2>
 
-<p>The latest version of kramdown is <b>1.0.0</b> and it was released
-on <b>2013-03-10</b>.</p>
+<p>The latest version of kramdown is <span class="inline-important">1.0.1</span> and it was released
+on <span class="inline-important">2013-03-11</span></p>
 
 <p>More <a href="{relocatable: news.html}">news</a>…</p>
 

data/lib/kramdown/options.rb

@@ -196,6 +196,8 @@ languages with many non-ASCII characters. By enabling this option
 the header text is transliterated to ASCII as good as possible so that
 the resulting header ID is more useful.
 
+The stringex library needs to be installed for this feature to work!
+
 Default: false
 Used by: HTML/Latex converter
 EOF

data/lib/kramdown/parser/base.rb

@@ -85,9 +85,9 @@ module Kramdown
       # Modify the string +source+ to be usable by the parser (unifies line ending characters to
       # +\n+ and makes sure +source+ ends with a new line character).
       def adapt_source(source)
-        if source.respond_to?(:encode!)
+        if source.respond_to?(:encode)
           raise "The encoding of the source text is not valid!" if !source.valid_encoding?
-          source.encode!('UTF-8')
+          source = source.encode('UTF-8')
         end
         source.gsub(/\r\n?/, "\n").chomp + "\n"
       end

data/lib/kramdown/parser/kramdown/extensions.rb

@@ -17,14 +17,18 @@ module Kramdown
       # +opts+.
       def parse_attribute_list(str, opts)
         attrs = str.scan(ALD_TYPE_ANY)
-        attrs.each do |key, sep, val, id_attr, class_attr, ref|
+        attrs.each do |key, sep, val, ref, id_and_or_class, _, _|
           if ref
             (opts[:refs] ||= []) << ref
-          elsif class_attr
-            opts[IAL_CLASS_ATTR] = (opts[IAL_CLASS_ATTR] || '') << " #{class_attr}"
-            opts[IAL_CLASS_ATTR].lstrip!
-          elsif id_attr
-            opts['id'] = id_attr
+          elsif id_and_or_class
+            id_and_or_class.scan(ALD_TYPE_ID_OR_CLASS).each do |id_attr, class_attr|
+              if class_attr
+                opts[IAL_CLASS_ATTR] = (opts[IAL_CLASS_ATTR] || '') << " #{class_attr}"
+                opts[IAL_CLASS_ATTR].lstrip!
+              else
+                opts['id'] = id_attr
+              end
+            end
           else
             val.gsub!(/\\(\}|#{sep})/, "\\1")
             opts[key] = val
@@ -125,8 +129,10 @@ module Kramdown
       ALD_TYPE_KEY_VALUE_PAIR = /(#{ALD_ID_NAME})=("|')((?:\\\}|\\\2|[^\}\2])*?)\2/
       ALD_TYPE_CLASS_NAME = /\.(#{ALD_ID_NAME})/
       ALD_TYPE_ID_NAME = /#(\w[\w:-]*)/
+      ALD_TYPE_ID_OR_CLASS = /#{ALD_TYPE_ID_NAME}|#{ALD_TYPE_CLASS_NAME}/
+      ALD_TYPE_ID_OR_CLASS_MULTI = /((?:#{ALD_TYPE_ID_NAME}|#{ALD_TYPE_CLASS_NAME})+)/
       ALD_TYPE_REF = /(#{ALD_ID_NAME})/
-      ALD_TYPE_ANY = /(?:\A|\s)(?:#{ALD_TYPE_KEY_VALUE_PAIR}|#{ALD_TYPE_ID_NAME}|#{ALD_TYPE_CLASS_NAME}|#{ALD_TYPE_REF})(?=\s|\Z)/
+      ALD_TYPE_ANY = /(?:\A|\s)(?:#{ALD_TYPE_KEY_VALUE_PAIR}|#{ALD_TYPE_REF}|#{ALD_TYPE_ID_OR_CLASS_MULTI})(?=\s|\Z)/
       ALD_START = /^#{OPT_SPACE}\{:(#{ALD_ID_NAME}):(#{ALD_ANY_CHARS}+)\}\s*?\n/
 
       EXT_STOP_STR = "\\{:/(%s)?\\}"

data/lib/kramdown/version.rb

@@ -10,6 +10,6 @@
 module Kramdown
 
   # The kramdown version.
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
 end

data/man/man1/kramdown.1

@@ -93,6 +93,8 @@ languages with many non-ASCII characters. By enabling this option
 the header text is transliterated to ASCII as good as possible so that
 the resulting header ID is more useful.
 
+The stringex library needs to be installed for this feature to work!
+
 Default: false
 Used by: HTML/Latex converter
 

data/test/testcases/block/11_ial/simple.html

@@ -1,5 +1,7 @@
 <p key1="val&quot;" key2="val'" class="other-class myclass class" id="other" key="val">Some paragraph.</p>
 
+<p class="cls1 cls2" id="id">Some paragraph.</p>
+
 <blockquote id="id" class="class">
   <p>quote</p>
 </blockquote>

data/test/testcases/block/11_ial/simple.text

@@ -1,6 +1,9 @@
 Some paragraph.
 {:.class id key="val"}
 
+Some paragraph.
+{:.cls1#id.cls2}
+
 > quote
 {: #id}
   {: .class}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 description: ! 'kramdown is yet-another-markdown-parser but fast, pure Ruby,
 
   using a strict syntax definition and supporting several common extensions.