docgenerator 2.1.0 → 2.1.1

data/unittest/expected_creole/test_creole_pictures_width.latex

@@ -1,4 +1,4 @@
 
 
-\includegraphics[width={\textwidth}]{Red_Flower.jpg}  
+\includegraphics[width={\textwidth},]{Red_Flower.jpg}  
 

data/unittest/expected_creole/test_creole_tabular.latex

@@ -3,9 +3,9 @@
 before  
 
 \begin{tabular}{ccc}
-1
- & 2
- & 3
+\textbf{1}
+ & \textbf{2}
+ & \textbf{3}
 \\
 eins
  & zwei

data/unittest/expected_creole/test_creole_tabular_creole.latex

@@ -3,8 +3,8 @@
 Tables are done like this:  
 
 \begin{tabular}{ll}
-header col1
- & header col2
+\textbf{header col1}
+ & \textbf{header col2}
 \\
 col1
  & col2

data/unittest/expected_creole/test_creole_tabular_css.latex

@@ -3,9 +3,9 @@
 before  
 
 \begin{tabular}{ccc}
-1
- & 2
- & 3
+\textbf{1}
+ & \textbf{2}
+ & \textbf{3}
 \\
 eins
  & zwei

data/unittest/expected_creole/test_creole_tabular_row_parameters.latex

@@ -0,0 +1,22 @@
+
+
+before  
+
+\begin{tabular}{ccc}
+Titel A
+ & Titel B
+ & Titel C
+\\\toprule
+eins
+ & zwei
+ & drei
+\\\midrule 
+eins
+ & zwei
+ & drei
+\\
+\end{tabular}
+
+
+after  
+

data/unittest/expected_templates/test_standalone.tex

@@ -0,0 +1,34 @@
+<<prefix>>
+\documentclass[ngerman]{standalone}
+\usepackage{babel}
+%Encoding-package depends on TeX-engine
+\usepackage{ifpdf,ifxetex,ifluatex}
+\ifxetex
+  \usepackage{fontspec}	%Without, umlauts are missing
+\fi
+\ifluatex
+  \usepackage[utf8]{luainputenc} %Or in first line: % !Mode:: "TeX:UTF-8".
+\else
+  \ifpdf\relax
+    \usepackage[utf8]{inputenc}
+  \fi
+\fi
+%\usepackage{hyperref}
+% ----------------------------------------------------------------
+
+\title{Test of Template standalone}
+\hypersetup{pdftitle={Test of Template standalone}}
+
+% ----------------------------------------------------------------
+\begin{document}
+
+
+Some text
+
+
+
+Umlaute: öäü ÖÄÜ ß
+
+
+\end{document}
+% ----------------------------------------------------------------

data/unittest/expected_wikimedia/test_wiki_picture.latex

@@ -1,7 +1,7 @@
 
 
 \bgroup 
-\includegraphics[]{Red_Flower.jpg}
+\includegraphics[,]{Red_Flower.jpg}
 \egroup 
  
 
@@ -9,16 +9,16 @@
 
 
 \bgroup 
-\includegraphics[]{Red_Flower.jpg}
+\includegraphics[,]{Red_Flower.jpg}
 \egroup 
  
 \bgroup 
-vorher\includegraphics[]{Red_Flower.jpg}\newline 
+vorher\includegraphics[,]{Red_Flower.jpg}\newline 
 
 \egroup 
  
 \bgroup 
-\includegraphics[]{Red_Flower.jpg}\newline 
+\includegraphics[,]{Red_Flower.jpg}\newline 
 nachher
 \egroup 
  
@@ -27,12 +27,12 @@ nachher
 
 
 \bgroup 
-\href{http://ruby.lickert.net}{\includegraphics[]{Red_Flower.jpg}}
+\href{http://ruby.lickert.net}{\includegraphics[,]{Red_Flower.jpg}}
 
 \egroup 
  
 \bgroup 
-\href{http://ruby.lickert.net}{\includegraphics[]{Red_Flower.jpg}}
+\href{http://ruby.lickert.net}{\includegraphics[,]{Red_Flower.jpg}}
 
 \egroup 
  
@@ -41,11 +41,11 @@ nachher
 
 
 \bgroup 
-\includegraphics[]{Red_Flower.jpg}
+\includegraphics[,]{Red_Flower.jpg}
 \egroup 
  
 \bgroup 
-\includegraphics[]{Red_Flower.jpg}
+\includegraphics[,]{Red_Flower.jpg}
 \egroup 
  
 
@@ -53,7 +53,7 @@ nachher
 
 
 \bgroup 
-\includegraphics[width={123px}]{Red_Flower.jpg}
+\includegraphics[width={123px},]{Red_Flower.jpg}
 \egroup 
  
 
@@ -61,15 +61,15 @@ nachher
 
 
 \bgroup 
-\includegraphics[]{Red_Flower.jpg}
+\includegraphics[,]{Red_Flower.jpg}
 \egroup 
  
 \bgroup 
-\includegraphics[]{Red_Flower.jpg}
+\includegraphics[,]{Red_Flower.jpg}
 \egroup 
  
 \bgroup 
-\includegraphics[]{Red_Flower.jpg}
+\includegraphics[,]{Red_Flower.jpg}
 \egroup 
  
 

data/unittest/unittest_creole.rb

@@ -3,7 +3,8 @@ if $0 == __FILE__
   $:.unshift("../lib")
 end
 
-gem 'test-unit'
+gem 'more_unit_test' #Wichtig das unit test-version correct verwendet wird
+#~ gem 'test-unit', '~> 2'
 require 'test/unit'
 require 'more_unit_test/assert_equal_filecontent.rb'
 
@@ -126,6 +127,7 @@ creole
     return unless $0 == __FILE__
     
     creole1 = Docgenerator::Creole::Creole.new( :name => 'input_file_rb/DATA', :content => DATA )
+
     creole2 = nil
     File.open($thisfile){|filehandle|
       #~ $log.warn('Test Filehandle auf ruby nicht m�glich (Test $0 == input.path)')
@@ -134,7 +136,8 @@ creole
       creole2 = Docgenerator::Creole::Creole.new( :name => 'input_file_rb', :content => filehandle, :log => $tmplog )
       $0 = $thisfile
     }
-    assert_equal( creole1.source, creole2.source)
+    #normalize line ends
+    assert_equal( creole1.source.map{|entry|entry.gsub( /\r\n?/, "\n")}, creole2.source)
   end
   def test_creole_input_file_simple
     assert_true(File.exist?('creole_testtext.creole'))
@@ -590,6 +593,23 @@ creole
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.text", creole.to_doc(:text, @opt))
   end  
 
+  def test_creole_list_ulul_without_ul()
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
+Text before
+**Listentry 1
+Text afterwords
+creole
+    )
+    @opt[:log] = $tmplog #Suppress error message
+    assert_equal_filecontent( "expected_creole/#{__method__}.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/#{__method__}.latex", creole.to_doc(:latex, @opt))
+    $log.warn("#{__method__}: to_context")
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.context", creole.to_doc(:context))
+    $log.warn("#{__method__}: list to wiki/creole")
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.text", creole.to_doc(:text, @opt))
+  end  
+  
   #Line breaks will be lost.
   def test_creole_ul_multiple_line()
     $log.warn('test_creole_ul_multiple_line: latex: grosse textl�cken (wrap mit leerzeichen bereinigen?)')
@@ -1104,7 +1124,6 @@ class Test_creole_characters < Test::Unit::TestCase
                     #~ :content => Creole::CHARACTERS.keys.sort.map{|char| "*#{char}" }.join("\n")
                     :content => Docgenerator::Creole::Creole::CHARACTERS.sort.map{|char, o| "* #{o.class}: #{char}"}.join("\n")
     )
-    self.readoption = 'r:cp1252'
     assert_equal_filecontent( "expected_creole/test_creole_characters_all.html", creole.to_doc(:html, @opt))
     
     $log.warn('test_creole_characters_all: to_latex Dollar Missing escape mechanism')

data/unittest/unittest_creole_tabular.rb

@@ -147,7 +147,40 @@ creole
     $log.warn('test_creole_tabular_css: to text')
     #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.text", creole.to_doc(:text))
   end #test_creole_tabular_css
-  
+
+  def test_creole_tabular_row_parameters()
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
+before
+<<<tabular
+|!columns=3
+|!columndescription=ccc
+|Titel A
+|Titel B
+|Titel C
+|-|toprule
+|eins
+|zwei
+|drei
+|-|midrule
+|eins
+|zwei
+|drei
+>>>
+after
+creole
+    )
+    $log.warn("#{__method__}: to_html")
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.html", creole.to_doc(:html, OPT))
+    assert_equal_filecontent( "expected_creole/#{__method__}.latex", creole.to_doc(:latex, OPT))
+    $log.warn("#{__method__}: to_context")
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.context", creole.to_doc(:context))
+    $log.warn("#{__method__}: to_creole")
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.creole", creole.to_doc(:creole))
+    $log.warn("#{__method__}: to text")
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.text", creole.to_doc(:text))
+  end #test_creole_tabular_row_parameters 
+
+
   def test_creole_tabular_multicols()
     creole = Docgenerator::Creole::Creole.new(:content => <<creole
 before

data/unittest/unittest_docgenerator.rb

@@ -1,8 +1,11 @@
 # encoding: utf-8
+gem 'more_unit_test'
 gem 'test-unit'
-require 'test/unit'
+
 #~ $:.unshift('C:/usr/Script/more_unit_test/lib')
 require 'more_unit_test/assert_equal_filecontent.rb'
+require 'test/unit'
+
 
 if $0 == __FILE__
   $:.unshift("../lib")
@@ -149,6 +152,45 @@ class Test_elements < Test::Unit::TestCase
     #~ assert_equal_filecontent( "expected/test_href.wiki", text.to_doc(:wiki,@opt))
     assert_equal_filecontent( "expected/test_href.text", text.to_doc(:text, @opt))  #not good
   end
+
+  def test_comment()
+    text = [
+      element(:p, {}, [ 'Now some text ', 
+          element(:comment, {}, 'comment'),
+          'interrupted by a comment',
+          ] ).cr
+    ]
+    assert_equal_filecontent( "expected/#{__method__}.html", text.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected/#{__method__}.latex", text.to_doc(:latex, @opt))
+    $log.warn("#{__method__}: to_context")
+    #~ assert_equal_filecontent( "expected/#{__method__}.context", text.to_doc(:context, @opt))
+    $log.warn("#{__method__}: to_creole")
+    #~ assert_equal_filecontent( "expected/#{__method__}.creole", text.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected/#{__method__}.wiki", text.to_doc(:wiki,@opt))
+    $log.warn("#{__method__}: to_text")
+    #~ assert_equal_filecontent( "expected/#{__method__}.text", text.to_doc(:text, @opt))  #not good
+  end
+
+  def test_comment_complex()
+    ul = element(:ul,{},[element(:item,{},'1'), element(:item,{},'2').cr])
+    text = [
+      ul,
+      element(:p, {}, [ 'Now some text ', 
+          element(:comment, {}, ul),
+          'interrupted by a comment',
+          ] ).cr
+    ]
+    assert_equal_filecontent( "expected/#{__method__}.html", text.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected/#{__method__}.latex", text.to_doc(:latex, @opt))
+    $log.warn("#{__method__}: to_context")
+    #~ assert_equal_filecontent( "expected/#{__method__}.context", text.to_doc(:context, @opt))
+    $log.warn("#{__method__}: to_creole")
+    #~ assert_equal_filecontent( "expected/#{__method__}.creole", text.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected/#{__method__}.wiki", text.to_doc(:wiki,@opt))
+    $log.warn("#{__method__}: to_text")
+    #~ assert_equal_filecontent( "expected/#{__method__}.text", text.to_doc(:text, @opt))  #not good
+  end
+  
 end #Test_elements 
 
 class Test_lists < Test::Unit::TestCase
@@ -315,8 +357,9 @@ class Test_tabular < Test::Unit::TestCase
     #~ assert_equal_filecontent( "expected/test_tabular_doc.html", text.to_doc(:html, @opt))
     
     #The row ends in tabulars are \\.
-    #When used in documents, \\ is  converted into \.
-    #So there is a special rule to double the \\ when used in combination with a filename.
+    #When used in documents, \\ was converted into \.
+    #So there was a special rule to double the \\ when used in combination with a filename.
+    #2012-06-07: Regexp in documen.rb was replaced with block version. 
     assert_equal_filecontent( "expected/test_tabular_doc.latex", doc.to_doc(:latex, 
                 { :log => doc.log, :template=> DocumentTemplate[:article], :filename => 'test'}
                 ) )