addedd \vspace syntax: --length--

diff --git a/code/wiki2beamer b/code/wiki2beamer
index aab5648f896f1806e4342b0b71742c0b5d7ef46e..430ce597f0b01dd3c2e560967bbf0b2638921fa9 100755 (executable)
--- a/code/wiki2beamer
+++ b/code/wiki2beamer
@@ -314,6 +314,17 @@ def transform_substitutions(string):
     string = p.sub(r"\1\\frownie\2", string)
     return string
 
+def transform_vspace(string):
+    """vspace"""
+    p = re.compile("^\s*--(.*)--\s*$")
+    string = p.sub(r"\n\\vspace{\1}\n", string)
+    return string
+
+def transform_vspacestar(string):
+    """vspace*"""
+    p = re.compile("^\s*--\*(.*)--\s*$")
+    string = p.sub(r"\n\\vspace*{\1}\n", string)
+    return string
 
 def transform(string, state):
     """ convert/transform one line in context of state"""
@@ -325,7 +336,7 @@ def transform(string, state):
     string = transform_h3_to_subsec(string, state)
     string = transform_h2_to_sec(string, state)
     string = transform_replace_headfoot(string, state)
-    
+
     string = transform_environments(string)
     string = transform_columns(string)
     string = transform_boldfont(string)
@@ -336,6 +347,8 @@ def transform(string, state):
     string = transform_footnotes(string)
     string = transform_graphics(string)
     string = transform_substitutions(string)
+    string = transform_vspacestar(string)
+    string = transform_vspace(string)
 
     string = transform_itemenums(string, state)
 

diff --git a/doc/man/wiki2beamer.xml b/doc/man/wiki2beamer.xml
index ca21d4a669e0f2e12ace1f95984b1f621c4d58b4..cce2fb1d108eeb88fafcc7db1601fc8263bc4eee 100644 (file)
--- a/doc/man/wiki2beamer.xml
+++ b/doc/man/wiki2beamer.xml
@@ -259,6 +259,21 @@ titleframe=True
        </variablelist>
 </refsect2>
 
+<refsect2><title>Layout</title>
+       <variablelist>
+               <varlistentry><term>--<replaceable>length</replaceable>--</term>
+                       <listitem><para>when found at start of line, with nothing afterwards,
+                       insert a \vspace{<replaceable>length</replaceable>} (vertical space of length
+                       <replaceable>length</replaceable>)</para></listitem>
+               </varlistentry>
+               <varlistentry><term>--*<replaceable>length</replaceable>--</term>
+                       <listitem><para>
+                       same as above, but insert a \vspace* (a forced vspace)
+                       </para></listitem>
+               </varlistentry>
+       </variablelist>
+</refsect2>
+
 <refsect2><title>Substitutions</title>
        <variablelist>
                <varlistentry><term>--&gt;</term>

diff --git a/tests/test_wiki2beamer.py b/tests/test_wiki2beamer.py
index 36bdf395b8cc9382862ea5a46856b713b3adbb5d..62ce6b5f5dd52dcefef9c87ffdcda7ccb74fe951 100755 (executable)
--- a/tests/test_wiki2beamer.py
+++ b/tests/test_wiki2beamer.py
@@ -75,6 +75,17 @@ class TestTransform(unittest.TestCase):
     def test_columns(self):
         self.assertEqual(transform('[[[6cm]]]', self.state), '\\column{6cm}')
 
+    def test_vspace(self):
+        self.assertEqual(transform('--3em--', self.state), '\n\\vspace{3em}\n')
+        self.assertEqual(transform('--3em--foo', self.state), '--3em--foo')
+        self.assertEqual(transform(' --3em-- ', self.state), '\n\\vspace{3em}\n')
+
+    def test_vspacestar(self):
+        self.assertEqual(transform('--*3em--', self.state), '\n\\vspace*{3em}\n')
+        self.assertEqual(transform('--*3em--foo', self.state), '--*3em--foo')
+        self.assertEqual(transform(' --*3em-- ', self.state), '\n\\vspace*{3em}\n')
+
+
 class TestExpandCode(unittest.TestCase):
     def test_search_escape_sequences_basic(self):
         code = "System435.out.println(\"foo\");123System.ou12t.println234(\"foo\");System.23out.23456println(\"foo\");S237yst28em.out.pr18intln(\"foo\");"