#35 fix plantuml handling with pandoc 1.13

bwl21 · Mar 27, 2017 · 6db7bd4 · 6db7bd4
1 parent 34d55a3
commit 6db7bd4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,11 @@
+# 1.0.2 (27.03.2017)
+-   fix plantuml handling with pandoc 1.13
+-   prefix header labels with filename to avoid conflicts in merged files
+
+# 1.0.1 (12.09.2016)
+
+-   no longer use reference links
+
 # 0.1.0 (24.12.2014)
 
 -   adapt to pandoc 1.13

diff --git a/lib/wortsammler/class.proolib.rb b/lib/wortsammler/class.proolib.rb
@@ -47,7 +47,7 @@
 
 EXPECTED_RESULT_PATTERN = /(^\s*)~~~~\s*\{.expectedResult\s+label=\"([A-Za-z]+_[A-Za-z]+_[0-9]+)\"}\s([^~]*)~~~~/x
 
-PLANTUML_PATTERN = /[~]{4,}\s+{\.plantuml}\s+@startuml\s+([^\n]+)(\s+title\s+([^\n]+))?[^~]+[~]{4,}/x
+PLANTUML_PATTERN = /[~`]{3,}\s+{\.plantuml}\s+@startuml\s+([^\n]+)(\s+title\s+([^\n]+))?[^~`]+[~`]{3,}/x
 
 #
 # This mixin convertes a file path to the os Path representation
@@ -484,7 +484,7 @@ def beautify(file)
     docfile.close
 
     # process the file in pandoc
-    cmd="pandoc -s #{file.esc} -f markdown -t markdown --atx-headers "
+    cmd="pandoc -s #{file.esc} -f markdown -t markdown --atx-headers --id-prefix=#{File.basename(file).esc}_ "
     newdoc = `#{cmd}`
     @log.debug "beautify #{file.esc}: #{$?}"
     @log.debug(" finished: \"#{file}\"")

diff --git a/lib/wortsammler/version.rb b/lib/wortsammler/version.rb
@@ -1,4 +1,4 @@
 module Wortsammler
   PROGNAME="wortsammler"
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end