mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge remote-tracking branch 'origin/hotfix-7.8.06'

This commit is contained in:
Jambunathan K 2012-04-20 23:15:06 +05:30
parent 6f78edd68c 7d4e7a8763
commit 3f427d92c8
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/styles/OrgOdtStyles.xml
View File

@ -654,34 +654,34 @@
<!-- Description List -->
<text:list-style style:name="OrgDescriptionList">
<text:list-level-style-number text:level="1" style:num-format="">
<style:list-level-properties text:space-before="0.635cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="0.635cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="2" style:num-format="">
<style:list-level-properties text:space-before="1.27cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="1.27cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="3" style:num-format="">
<style:list-level-properties text:space-before="1.905cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="1.905cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="4" style:num-format="">
<style:list-level-properties text:space-before="2.54cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="2.54cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="5" style:num-format="">
<style:list-level-properties text:space-before="3.175cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="3.175cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="6" style:num-format="">
<style:list-level-properties text:space-before="3.81cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="3.81cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="7" style:num-format="">
<style:list-level-properties text:space-before="4.445cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="4.445cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="8" style:num-format="">
<style:list-level-properties text:space-before="5.08cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="5.08cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="9" style:num-format="">
<style:list-level-properties text:space-before="5.715cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="5.715cm"/>
</text:list-level-style-number>
<text:list-level-style-number text:level="10" style:num-format="">
<style:list-level-properties text:space-before="6.35cm" text:min-label-width="0.635cm"/>
<style:list-level-properties text:space-before="6.35cm"/>
</text:list-level-style-number>
</text:list-style>

2
etc/styles/README
View File

@ -1,7 +1,7 @@
The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
following copyright information:
Copyright (C) 2010-2011 Free Software Foundation, Inc.
Copyright (C) 2010-2012 Free Software Foundation, Inc.
These files are part of GNU Emacs.

1
lisp/org-odt.el
View File

@ -1696,7 +1696,6 @@ ATTR is a string of other attributes of the a element."
(or (not thefile) (string= thefile ""))
(plist-get org-lparse-opt-plist :section-numbers)
(setq sec-frag fragment)
(org-find-text-property-in-string 'org-no-description fragment)
(or (string-match "\\`sec\\(\\(-[0-9]+\\)+\\)" sec-frag)
(and (setq sec-frag
(loop for alias in org-export-target-aliases do