Re: [O] odt-Export and #+CAPTION: [reference text]{caption text}

2012-03-31 Thread Bastien
Jambunathan K kjambunat...@gmail.com writes:

 Jambunathan K kjambunat...@gmail.com writes:

 I have applied my patch to the hotfix branch.

Thanks for the diligent action taken Jambunathan.

-- 
 Bastien



Re: [O] odt-Export and #+CAPTION: [reference text]{caption text}

2012-03-30 Thread Martin Gürtler
Hi Jambunathan, 

thanks for the quick help.

Am Freitag, den 30.03.2012, 01:04 +0530 schrieb Jambunathan K:

 May be you are trying to build an index out of object names... Or pick
 and choose objects of interest.  Please upgrade to the following commit
 and report back any problems or suggestions.
 
 I have pushed the commit to master branch.  If you are quick enough with
 your feedback, I can commit this change to hotfix-7.8.06 branch so that
 it can reach Emacs-24.1.
 

I just pulled from orgmode.org.

It does what I want. Unless there is some formatting in the caption.
Then you get an invalid content.xml, even if you don't use the new
feature (ie with a simple '#+CAPTION: a_i').

minimal example:

#+CAPTION: [*a_i*]{a_i is named =A\_i=}
#+LABEL: tab:referenced table
| a | b | c |
|---+---+---|
| 1 | 2 | 3 |
 
Best regards,

Martin

 ,
 | commit 67694297fa0f9b32cf4bfe812ba8a5c5cf4a0859
 | Author: Jambunathan K kjambunat...@gmail.com
 | Date:   Fri Mar 30 00:30:46 2012 +0530
 | 
 | org-odt.el: Honor short caption for table, figure etc
 `
 
 Btw, any feedback on these two fixes?
 
 http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg00798.html
 http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg00797.html
 
  Regards,
 
  Martin





Re: [O] odt-Export and #+CAPTION: [reference text]{caption text}

2012-03-30 Thread Jambunathan K

 It does what I want. 
I have applied my patch to the hotfix branch.

 Unless there is some formatting in the caption.

This is a limitation that we need to live with.  

That said, if you want the short captions in bold, then the right thing
to do would be to apply the style to the index entry and not to
individual captions.  Have you experimented with the styles tab in the
Index creator...I haven't checked it myself though.

 Then you get an invalid content.xml, even if you don't use the new
 feature (ie with a simple '#+CAPTION: a_i').

 minimal example:

 #+CAPTION: [*a_i*]{a_i is named =A\_i=}
 #+LABEL: tab:referenced table
 | a | b | c |
 |---+---+---|
 | 1 | 2 | 3 |

If you unzip the file you will see that the short caption goes as an
attribute while long caption goes as body text.

LibreOffice doesn't even allow entering space in the object names.  If
you know of any workarounds that will help mimic short captions, I can
add it.



Re: [O] odt-Export and #+CAPTION: [reference text]{caption text}

2012-03-30 Thread Martin Gürtler
Hi Jambunathan,

Am Freitag, den 30.03.2012, 18:38 +0530 schrieb Jambunathan K:
  It does what I want. 
 I have applied my patch to the hotfix branch.
 
  Unless there is some formatting in the caption.
 
 This is a limitation that we need to live with.  

(Unfortunately, this seems to be so for super/subscripts as well.)

I just found out that now the exporter depends on supplying a short
caption, if the caption contains formatting (which also means
subscripts). If you just give it one version (ala #+CAPTION: a_i), and
the caption contains ,say, a subscript, content.xml becomes invalid. It
works only, if you supply it in the form #+CAPTION: []{a_i}. (Probably,
you take the long versionalso for the short one, if only one is
supplied.) I think this should be fixed as it could break existing
documents.

Regards,

Martin




Re: [O] odt-Export and #+CAPTION: [reference text]{caption text}

2012-03-30 Thread Jambunathan K

 I have applied my patch to the hotfix branch.

I am having second thoughts.  I will slightly re-work the patch so it
doesn't bomb the ODT file in unexpected ways.  I will drop a note once I
am done with it.



Re: [O] odt-Export and #+CAPTION: [reference text]{caption text}

2012-03-30 Thread Jambunathan K
Martin Gürtler martin.guert...@gmx.de writes:

 (Probably,
 you take the long versionalso for the short one, if only one is
 supplied.) I think this should be fixed as it could break existing
 documents.

Our mails crossed and we have arrived at the same conclusion.  Give me
few hours to fix it.



Re: [O] odt-Export and #+CAPTION: [reference text]{caption text}

2012-03-30 Thread Jambunathan K
Jambunathan K kjambunat...@gmail.com writes:

 I have applied my patch to the hotfix branch.

 I am having second thoughts.  I will slightly re-work the patch so it
 doesn't bomb the ODT file in unexpected ways.  I will drop a note once I
 am done with it.

Short captions if not provided will take their values from long caption.
See the commit message for more information.

I am not checking in this change to hotfix-7.8.06 branch.  If it bombs
again and someone else complains, I will revoke the fix.

If you need index entries to be in bold, fix the paragraph style.

Btw, I wonder why LibreOffice UI doesn't allow space (apart from other
characters) in the object names. The OpenDocument v1.1 explicitly has
the following example and as you can see the table name has spaces.
Anyways, looks like LibreOffice behaviour is buggy.

,
| table:table table:name=Table 1 table:style-name=Table 1
| ...
| /table:table
`

,
| commit 8a02f48547df4f11b0402aa0a4fe339e3b85c608
| Author: Jambunathan K kjambunat...@gmail.com
| Date:   Sat Mar 31 02:03:10 2012 +0530
| 
| org-odt.el: Consider short captions not as org text but as plain text
| 
| * lisp/org-lparse.el (org-lparse-insert-org-table): Consider
| short caption as plain text and not as org text.
| * lisp/org-odt.el (org-export-odt-format-formula)
| (org-export-odt-format-image): ditto.
| 
| Fixes earlier checkin.  See
| http://lists.gnu.org/archive/html/emacs-orgmode/2012-03/msg01212.html
| 
| Handling of short captions is only a convenience feature.
| 
| From within LibreOffice one can always create an unprotected
| editable index and later manually delete unwanted index entries (for
| example, delete uncaptioned entries which are given automatic names)
| or modify existing entries (for example, fix long captions to their
| short versions).
`