Hi Dag, nice to see the progress.
I've attached a patch:
- The line_break.py filter is no longer necessary (handled by replacements3
substittion).
http://code.google.com/p/asciidoc/source/detail?r=05257f9b440922e8971a1e313df036b2d3a629c4
- strip() backend_opts in a2x.conf.
Some time back I worked with Lex to add the {blockname} attribute for ODF nested
paragraphs, did that work out?
See:
http://groups.google.com/group/asciidoc/browse_thread/thread/8200e29815c40f72?pli=1
8<-----------------
8. The `{blockname}` attribute identifies the style of the current
block. It applies to delimited blocks, lists and tables. Here is a
list of `{blockname}` values (does not include filters or custom
block and style names):
delimited blocks:: comment, sidebar, open, pass, literal, verse,
listing, quote, example, note, tip, important, caution, warning,
abstract, partintro
lists:: arabic, loweralpha, upperalpha, lowerroman, upperroman,
labeled, labeled3, labeled4, qanda, horizonatal, bibliography,
glossary
tables:: table
8<-----------------
Cheers, Stuart
On 08/02/12 11:55, Dag Wieers wrote:
Hi,
There has been some progress on the ODF front. Most related to integration with
other existing software.
- We managed to get the ODF support in GNU source-highlight release as
part of v3.1.6
- We managed to get unencapsulated SVG support into LibreOffice so that
we can have base64 SVG files embedded in Flat ODF files and zipped ODF
files
- In the upcoming LibreOffice 3.4.6 and 3.5.1, Flat ODF files will work
out of the box on the default Windows installation (now it requires a
custom installation)
- We are still pursuing to have Flat ODF file associations (currently the
mime-types are not being installed as expected)
- We managed to get xmllint fixed to parse ODF using RelaxNG
Apart from some small visual changes to the default stylesheets, the ODF backend
itself has not evolved much. I am hoping some people come forward to help out
finishing the backend as I lack sufficient free time atm. :-/
--
You received this message because you are subscribed to the Google Groups
"asciidoc" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/asciidoc?hl=en.
[1;32mdiff --git a/odt.conf b/odt.conf[m
[1;32mindex c828312..04fbf5a 100644[m
[1;32m--- a/odt.conf[m
[1;32m+++ b/odt.conf[m
[1;33m@@ -15,6 +15,11 @@[m
[m
[miscellaneous][m
outfilesuffix=.fodt[m
[1;36m+[m[1;36msubsverbatim=specialcharacters,callouts,replacements3[m
[1;36m+[m
[1;36m+[m[1;36m[replacements3][m
[1;36m+[m[1;36m(\n|$)=<text:line-break/>\n[m
[1;36m+[m[1;36m\s=<text:s/>[m
[m
[attributes][m
basebackend=odf[m
[1;33m@@ -167,9 +172,6 @@[m [mendif::icons[][m
[comment-blockmacro][m
{showcomments#}<text:p text:style-name="comment">{passtext}</text:p>[m
[m
[1;31m-[paradef-literal][m
[1;31m-filter="line_break.py"[m
[1;31m-[m
[literal-inlinemacro][m
# Inline literal.[m
<text:span text:style-name="monospaced">{passtext}</text:span>[m
[1;33m@@ -351,9 +353,6 @@[m [mcomment-style=template="commentblock",options=(),subs=("normal",)[m
{showcomments#}<text:p text:style-name="comment">|</text:p>[m
[m
# Delimited blocks.[m
[1;31m-[blockdef-listing][m
[1;31m-filter="line_break.py"[m
[1;31m-[m
[listingblock][m
<text:p text:style-name="title">{id?<text:bookmark-start text:name="{id}"/>}{title}{id?<text:bookmark-end text:name="{id}"/>}</text:p>[m
<text:p text:style-name="listingblock">{title!{id?<text:bookmark text:name="{id}"/>}}|</text:p>[m
[1;33m@@ -371,9 +370,6 @@[m [mifdef::pygments[source-style=template="source-highlight-block",presubs=(),postsu[m
postsubs=callouts[m
filter=source-highlight -f odf -s {language} {src_numbered?--line-number} {src_tab?--tab={src_tab}}[m
[m
[1;31m-[blockdef-literal][m
[1;31m-filter="line_break.py"[m
[1;31m-[m
[literalblock][m
<text:p text:style-name="title">{id?<text:bookmark-start text:name="{id}"/>}{title}{id?<text:bookmark-end text:name="{id}"/>}</text:p>[m
<text:p text:style-name="literalblock">{title!{id?<text:bookmark text:name="{id}"/>}}|</text:p>[m
[1;33m@@ -404,7 +400,7 @@[m [mtemplate::[quoteblock][m
[m
### FIXME: filter for verseblock does not work[m
[blockdef-quote][m
[1;31m-verse-style=template="verseblock",filter="line_break.py"[m
[1;36m+[m[1;36mverse-style=template="verseblock"[m
[m
### FIXME: Add {role} ?[m
[quoteblock][m
[1;32mdiff --git a/packaged/a2x.conf b/packaged/a2x.conf[m
[1;32mindex f9a53c4..1b89a5d 100644[m
[1;32m--- a/packaged/a2x.conf[m
[1;32m+++ b/packaged/a2x.conf[m
[1;33m@@ -75,7 +75,7 @@[m [mclass odt_archive:[m
[m
def to_odt(self):[m
opts = AttrDict(base_doc=None, temp_dir=None) # TODO default base doc?[m
[1;31m- u = [ o.strip().split('=') for o in self.backend_opts.split('--') if o != '' ][m
[1;36m+[m [1;36mu = [ o.strip().split('=') for o in self.backend_opts.strip().split('--') if o != '' ][m
opts.update(u)[m
if opts.base_doc is None:[m
die("No base document found")[m
