headers
blais | 1 Jan 2009 06:08
Picon

r5836 - in trunk/docutils/tools/editors/emacs/tests: Makefile tests-adjust-section.el

Author: blais
Date: 2009-01-01 06:08:58 +0100 (Thu, 01 Jan 2009)
New Revision: 5836

Modified:
   trunk/docutils/tools/editors/emacs/tests/Makefile
   trunk/docutils/tools/editors/emacs/tests/tests-adjust-section.el
Log:
Fixed batch tests for rst.el (thanks to Jeffrey C. Jacobs for notifying they were broken)

Modified: trunk/docutils/tools/editors/emacs/tests/Makefile
===================================================================
--- trunk/docutils/tools/editors/emacs/tests/Makefile	2008-12-30 15:35:56 UTC (rev 5835)
+++ trunk/docutils/tools/editors/emacs/tests/Makefile	2009-01-01 05:08:58 UTC (rev 5836)
 <at>  <at>  -1,6 +1,6  <at>  <at> 
 #!/usr/bin/env make

-EMACS=/usr/bin/emacs-23-unicode
+EMACS=/usr/bin/emacs

 runtests:
 	$(EMACS) --batch -l tests-basic.el

Modified: trunk/docutils/tools/editors/emacs/tests/tests-adjust-section.el
===================================================================
--- trunk/docutils/tools/editors/emacs/tests/tests-adjust-section.el	2008-12-30 15:35:56 UTC
(rev 5835)
+++ trunk/docutils/tools/editors/emacs/tests/tests-adjust-section.el	2009-01-01 05:08:58 UTC
(rev 5836)
 <at>  <at>  -820,11 +820,18  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
blais | 1 Jan 2009 19:12
Picon

r5837 - trunk/docutils/tools/editors/emacs/rst.el

Author: blais
Date: 2009-01-01 19:12:07 +0100 (Thu, 01 Jan 2009)
New Revision: 5837

Modified:
   trunk/docutils/tools/editors/emacs/rst.el
Log:
rst.el: Applied patch from darklord <at> timehorse.com for parameterized TOC support.

Modified: trunk/docutils/tools/editors/emacs/rst.el
===================================================================
--- trunk/docutils/tools/editors/emacs/rst.el	2009-01-01 05:08:58 UTC (rev 5836)
+++ trunk/docutils/tools/editors/emacs/rst.el	2009-01-01 18:12:07 UTC (rev 5837)
 <at>  <at>  -1861,7 +1861,7  <at>  <at> 
   ;;      [more lines]
   ;;
   (let ((beg
-         (re-search-forward "^\\.\\. contents[ \t]*::\\(.*\\)\n\\.\\."
+         (re-search-forward "^\\.\\. contents[ \t]*::\\(.*\\)\n\\([ \t]+:\\w+:.*\n\\)*\\.\\."
                             nil t))
         last-real)
     (when beg

------------------------------------------------------------------------------
Permalink | Reply | 0 comments |
headers
matt_harrison | 6 Jan 2009 06:45
Picon

r5838 - trunk/sandbox/rst2odp/bin/rst2odp

Author: matt_harrison
Date: 2009-01-06 06:45:28 +0100 (Tue, 06 Jan 2009)
New Revision: 5838

Modified:
   trunk/sandbox/rst2odp/bin/rst2odp
Log:
add support for doctest_block

Modified: trunk/sandbox/rst2odp/bin/rst2odp
===================================================================
--- trunk/sandbox/rst2odp/bin/rst2odp	2009-01-01 18:12:07 UTC (rev 5837)
+++ trunk/sandbox/rst2odp/bin/rst2odp	2009-01-06 05:45:28 UTC (rev 5838)
 <at>  <at>  -181,6 +181,8  <at>  <at> 
             pass
         elif self.at('reference'):
             pass
+        elif self.at('doctest_block'):
+            pass
         else:
             self.cur_slide.write(node.astext())
     depart_Text = _dumb_depart
 <at>  <at>  -226,6 +228,8  <at>  <at> 
             return # block quote adds paragraph style
         elif not self.cur_slide.text_frames:
             self.cur_slide.add_text_frame()
+        elif self.at('doctest_block'):
+            pass

     def depart_paragraph(self, node):
(Continue reading)

Permalink | Reply | 0 comments |
headers
dkuhlman | 7 Jan 2009 20:09
Picon

r5839 - in trunk/docutils: docs/user/odt.txt docutils/core.py docutils/io.py docutils/writers/odf_odt/__init__.py docutils/writers/odf_odt/pygmentsformatter.py setup.py tools/rst2odt.py tools/rst2odt_prepstyles.py

Author: dkuhlman
Date: 2009-01-07 20:09:28 +0100 (Wed, 07 Jan 2009)
New Revision: 5839

Added:
   trunk/docutils/docutils/writers/odf_odt/pygmentsformatter.py
Modified:
   trunk/docutils/docs/user/odt.txt
   trunk/docutils/docutils/core.py
   trunk/docutils/docutils/io.py
   trunk/docutils/docutils/writers/odf_odt/__init__.py
   trunk/docutils/setup.py
   trunk/docutils/tools/rst2odt.py
   trunk/docutils/tools/rst2odt_prepstyles.py
Log:
Misc updates after initial checkin

Modified: trunk/docutils/docs/user/odt.txt
===================================================================
--- trunk/docutils/docs/user/odt.txt	2009-01-06 05:45:28 UTC (rev 5838)
+++ trunk/docutils/docs/user/odt.txt	2009-01-07 19:09:28 UTC (rev 5839)
 <at>  <at>  -34,55 +34,19  <at>  <at> 
 You can learn more about Docutils and reST here: `Docutils`_

 
-How to Install It
-=================
-
-Where to get it
----------------
(Continue reading)

Permalink | Reply | 0 comments |
headers
matt_harrison | 9 Jan 2009 19:36
Picon

r5840 - in trunk/sandbox/rst2odp: README bin/rst2odp odplib/meta.py odplib/preso.py

Author: matt_harrison
Date: 2009-01-09 19:36:36 +0100 (Fri, 09 Jan 2009)
New Revision: 5840

Modified:
   trunk/sandbox/rst2odp/README
   trunk/sandbox/rst2odp/bin/rst2odp
   trunk/sandbox/rst2odp/odplib/meta.py
   trunk/sandbox/rst2odp/odplib/preso.py
Log:
add --mono-font (to specify monospace font), complicate the write method (hopefully to make it more 'correct')

Modified: trunk/sandbox/rst2odp/README
===================================================================
--- trunk/sandbox/rst2odp/README	2009-01-07 19:09:28 UTC (rev 5839)
+++ trunk/sandbox/rst2odp/README	2009-01-09 18:36:36 UTC (rev 5840)
 <at>  <at>  -7,6 +7,8  <at>  <at> 

 rst2odp path/to/rstfile.rst output.odp

+(use --traceback -r 3 for debug)
+
 Styling is supported with the ``--template-file`` switch, just pass it
 an .otp file

Modified: trunk/sandbox/rst2odp/bin/rst2odp
===================================================================
--- trunk/sandbox/rst2odp/bin/rst2odp	2009-01-07 19:09:28 UTC (rev 5839)
+++ trunk/sandbox/rst2odp/bin/rst2odp	2009-01-09 18:36:36 UTC (rev 5840)
 <at>  <at>  -78,6 +78,10  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
matt_harrison | 9 Jan 2009 22:27
Picon

r5841 - trunk/sandbox/rst2odp/odplib/preso.py

Author: matt_harrison
Date: 2009-01-09 22:27:21 +0100 (Fri, 09 Jan 2009)
New Revision: 5841

Modified:
   trunk/sandbox/rst2odp/odplib/preso.py
Log:
start of import slide in odplib

Modified: trunk/sandbox/rst2odp/odplib/preso.py
===================================================================
--- trunk/sandbox/rst2odp/odplib/preso.py	2009-01-09 18:36:36 UTC (rev 5840)
+++ trunk/sandbox/rst2odp/odplib/preso.py	2009-01-09 21:27:21 UTC (rev 5841)
 <at>  <at>  -151,7 +151,25  <at>  <at> 
         self._auto_styles = sub_el(self._root, 'office:automatic-styles')
         o_body = sub_el(self._root, 'office:body')
         self._presentation = sub_el(o_body, 'office:presentation')
+        
+    def add_imported_auto_style(self, style_node):
+        self._auto_styles.append(style_node)
+        style_node.parent = self._auto_styles

+    def import_slide(self, preso_file, page_num):
+        odp = zipwrap.ZipWrap(preso_file)
+        content = odp.cat('content.xml')
+        content_tree = et.fromstring(content)
+        slides = content_tree.findall('{urn:oasis:names:tc:opendocument:xmlns:office:1.0}body/{urn:oasis:names:tc:opendocument:xmlns:office:1.0}presentation/{urn:oasis:names:tc:opendocument:xmlns:drawing:1.0}page')
+        slide_xml = None
+        for slide in slides:
+            name = slide.attrib.get('{urn:oasis:names:tc:opendocument:xmlns:drawing:1.0}name', None)
(Continue reading)

Permalink | Reply | 0 comments |
headers
matt_harrison | 9 Jan 2009 22:38
Picon

r5842 - trunk/sandbox/rst2odp/odplib/preso.py

Author: matt_harrison
Date: 2009-01-09 22:38:09 +0100 (Fri, 09 Jan 2009)
New Revision: 5842

Modified:
   trunk/sandbox/rst2odp/odplib/preso.py
Log:
fix slide finding logic for import

Modified: trunk/sandbox/rst2odp/odplib/preso.py
===================================================================
--- trunk/sandbox/rst2odp/odplib/preso.py	2009-01-09 21:27:21 UTC (rev 5841)
+++ trunk/sandbox/rst2odp/odplib/preso.py	2009-01-09 21:38:09 UTC (rev 5842)
 <at>  <at>  -161,12 +161,11  <at>  <at> 
         content = odp.cat('content.xml')
         content_tree = et.fromstring(content)
         slides = content_tree.findall('{urn:oasis:names:tc:opendocument:xmlns:office:1.0}body/{urn:oasis:names:tc:opendocument:xmlns:office:1.0}presentation/{urn:oasis:names:tc:opendocument:xmlns:drawing:1.0}page')
-        slide_xml = None
-        for slide in slides:
-            name = slide.attrib.get('{urn:oasis:names:tc:opendocument:xmlns:drawing:1.0}name', None) 
-            if name in ['page%d' %page_num, 'Slide %d'%page_num]: 
-                slide_xml = slide
-                break
+        try:
+            slide_xml = slides[page_num - 1]
+        except IndexError, e:
+            print "Can't find page_num %d only %d slides" %(page_num, len(slides))
+            raise
         if slide_xml:
             self.slides.append(XMLSlide(self, slide_xml, odp))
(Continue reading)

Permalink | Reply | 0 comments |
headers
matt_harrison | 10 Jan 2009 02:39
Picon

r5843 - in trunk/sandbox/rst2odp: bin/rst2odp odplib/preso.py

Author: matt_harrison
Date: 2009-01-10 02:39:00 +0100 (Sat, 10 Jan 2009)
New Revision: 5843

Modified:
   trunk/sandbox/rst2odp/bin/rst2odp
   trunk/sandbox/rst2odp/odplib/preso.py
Log:
add --pages-to-export option (useful for debugging and limiting pages)

Modified: trunk/sandbox/rst2odp/bin/rst2odp
===================================================================
--- trunk/sandbox/rst2odp/bin/rst2odp	2009-01-09 21:38:09 UTC (rev 5842)
+++ trunk/sandbox/rst2odp/bin/rst2odp	2009-01-10 01:39:00 UTC (rev 5843)
 <at>  <at>  -69,6 +69,24  <at>  <at> 

 rst.directives.register_directive('code-block', SyntaxHighlightCodeBlock)

+class ImportNode(nodes.General, nodes.Inline, nodes.Element): pass
+
+class ImportSlideBlock(rst.Directive):
+    required_arguments = 2
+    optional_arguments = 0
+    has_content = False
+    node_class = ImportNode
+    #
+    # See visit_literal_block for code that processes the node 
+    #   created here.
+    def run(self):
+        odp_path = self.arguments[0]
(Continue reading)

Permalink | Reply | 0 comments |
headers
matt_harrison | 10 Jan 2009 04:32
Picon

r5844 - trunk/sandbox/rst2odp/odplib/preso.py

Author: matt_harrison
Date: 2009-01-10 04:32:55 +0100 (Sat, 10 Jan 2009)
New Revision: 5844

Modified:
   trunk/sandbox/rst2odp/odplib/preso.py
Log:
fix manifest generation for .gif and .png

Modified: trunk/sandbox/rst2odp/odplib/preso.py
===================================================================
--- trunk/sandbox/rst2odp/odplib/preso.py	2009-01-10 01:39:00 UTC (rev 5843)
+++ trunk/sandbox/rst2odp/odplib/preso.py	2009-01-10 03:32:55 UTC (rev 5844)
 <at>  <at>  -218,12 +218,18  <at>  <at> 
 <manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
  <manifest:file-entry manifest:media-type="application/vnd.oasis.opendocument.presentation" manifest:full-path="/"/>
 """
-        for filename in zip.cat('/'):
+        files = zip.cat('/')
+        files.extend(zip.cat('/Pictures'))
+        for filename in files:
             filetype = ''
             if filename.endswith('.xml'):
                 filetype = 'text/xml'
             elif filename.endswith('.jpg'):
                 filetype = 'image/jpeg'
+            elif filename.endswith('.gif'):
+                filetype = 'image/gif'
+            elif filename.endswith('.png'):
+                filetype = 'image/png'
(Continue reading)

Permalink | Reply | 0 comments |
headers
milde | 13 Jan 2009 17:35
Picon

r5845 - trunk/sandbox/latex-variants/README.txt

Author: milde
Date: 2009-01-13 17:35:22 +0100 (Tue, 13 Jan 2009)
New Revision: 5845

Modified:
   trunk/sandbox/latex-variants/README.txt
Log:
latex-variants/README: some proposals are now realized, new ideas added

Modified: trunk/sandbox/latex-variants/README.txt
===================================================================
--- trunk/sandbox/latex-variants/README.txt	2009-01-10 03:32:55 UTC (rev 5844)
+++ trunk/sandbox/latex-variants/README.txt	2009-01-13 16:35:22 UTC (rev 5845)
 <at>  <at>  -12,7 +12,7  <at>  <at> 

 #. enhancements or improvements of the latex2e writer, or

-#. alternative latex writers for special needs.
+#. `alternative latex writers`_ for special needs.

 .. contents::

 <at>  <at>  -22,147 +22,102  <at>  <at> 
 Questionnaire
 =============

-1. Do you use custom `LaTeX style sheets`_ with Docutils-generated LaTeX
-   files?
+#. Which `default font`_ do you prefer for the output?
(Continue reading)

Permalink | Reply | 0 comments |

Gmane