Commit Graph

43 Commits

Author SHA1 Message Date
Bastien Guerry bb0492d717 doc/orgcard.tex: Update version number
Also update etc/ORG-NEWS.
2013-04-22 08:27:40 +02:00
Nicolas Goaziou 9c854372ff ox-odt: Fix export of footnotes outside subtree during subtree export
* etc/styles/OrgOdtStyles.xml: Define "OrgFootnoteCenter" and
  "OrgFootnoteQuotations" styles.
* lisp/ox-odt.el (org-odt--format-paragraph): New function.
(org-odt-paragraph): Use new function to limit code duplication.
(org-odt-footnote-reference): Change default style for paragraphs when
transcoding a footnote definition.
2013-04-01 17:23:32 +02:00
Bastien Guerry 679dce0fda Merge branch 'maint' 2013-01-08 15:26:17 +01:00
Bastien Guerry 31c1aeabae Various small fixes 2013-01-08 15:26:04 +01:00
Bastien Guerry 86737d323e Merge branch 'maint' 2013-01-08 11:54:58 +01:00
Bastien Guerry 0bcb86f4ca etc/ORG-NEWS: Update 2013-01-08 11:46:29 +01:00
Bastien Guerry 7feec64988 Merge branch 'maint' 2013-01-07 22:29:11 +01:00
Bastien Guerry 55a4789661 etc/ORG-NEWS: Add information about Org 7.9.3 2013-01-07 22:28:54 +01:00
Bastien Guerry 60b23bdeac Merge branch 'maint'
Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el
2013-01-01 16:06:17 +01:00
Bastien Guerry 98cd4687a2 Update copyright years.
Happy new year!
2013-01-01 16:04:24 +01:00
Jambunathan K 293a14d13f Update OpenDocument schema files to v1.2 OASIS standard
* etc/schema/od-schema-v1.2-os.rnc: OASIS standard
* etc/schema/od-manifest-schema-v1.2-os.rnc: OASIS standard
* etc/schema/schemas.xml: Fix uri to rnc files.
* lisp/org-odt.el (org-export-odt-schema-dir): Modified to
accommodate change in rnc file names.
* contrib/lisp/org-e-odt.el (org-e-odt-schema-dir): Modified
to accommodate change in rnc file names.
2012-12-23 12:44:42 +01:00
Jambunathan K d9df7edb18 OrgOdtStyles.xml, OrgOdtContentTemplate.xml: Refresh
* etc/styles/OrgOdtContentTemplate.xml (OrgIndexSection): New.

* etc/styles/OrgOdtStyles.xml (Heading): Add tabstop.
(OrgVerse): Modify background color.
(OrgFixedWidthBlock, Horizontal_20_Line): Modify border thickness.
(OrgTodo, OrgDone): Remove foreground color.
(OrgTag): Remove background color, use small caps.
(OrgClock, OrgClockLastLine, OrgPlanning, OrgTags)
(OrgPriority, OrgPriority-A, OrgPriority-B, OrgPriority-C)
(OrgTimestamp, OrgActiveTimestamp, OrgInactiveTimestamp)
(OrgScheduledKeyword, OrgDeadlineKeyword, OrgClockKeyword)
(OrgClosedKeyword, OrgDate): New styles, for use with the new
exporter.
2012-12-23 12:44:42 +01:00
Bastien Guerry 47486f4b90 Merge branch 'maint' 2012-10-23 18:39:32 +02:00
Bastien Guerry 95ca977411 Fix typos fixed in Emacs (part 1)
Thanks to Paul Eggert for the fixes:
http://lists.gnu.org/archive/html/emacs-diffs/2012-10/msg00069.html
2012-10-23 18:39:20 +02:00
Bastien Guerry a5483f2d39 Merge branch 'maint' 2012-09-29 23:46:15 +02:00
Bastien Guerry dbd5a2188f Update ORG-NEWS 2012-09-29 23:41:16 +02:00
Jambunathan K 5ab9eaaabb OrgOdtStyles.xml: Typeset numbered formula differently
* etc/styles/OrgOdtStyles.xml (OrgFormula): New paragraph style.
(OrgFormulaCaptionFrame): Modified.
2012-09-14 02:08:00 +05:30
Bastien Guerry 87208bdecd etc/ORG-NEWS: Update to reflect changes in 7.9.1 2012-09-03 11:18:55 +02:00
Bastien Guerry b2fa4cbbbf etc/ORG-NEWS: add license and some more information. 2012-04-26 19:01:29 +02:00
Bastien Guerry a1a5c15e7e etc/ORG-NEWS: Major rewriting. 2012-04-26 18:48:56 +02:00
Bastien Guerry b112ac9c2f Add etc/ORG-NEWS
This file will go in Emacs repository.

This version is a draft.  Instead of sorting by versions,
we should try to detail new features, incompatible changes
and important bug fixes.  Since 6.33x...
2012-04-21 16:26:28 +02:00
Achim Gratz b323d9e5c3 move schema files to etc/ and modify makefile to install them into $(datadir)
etc/Makefile: add "schema" to $(ETCDIRS)

	contrib/odt/etc/schema/od-manifest-schema-v1.2-cs01.rnc: move to etc/schema/od-manifest-schema-v1.2-cs01.rnc

	contrib/odt/etc/schema/od-schema-v1.2-cs01.rnc: move to etc/schema/od-schema-v1.2-cs01.rn

	contrib/odt/etc/schema/schemas.xml: move to etc/schema/schemas.xml
2012-04-20 21:04:12 +02:00
Achim Gratz 24fa46a9e5 more robust shell code for install/clean-install
{etc,lisp}/Makefile: use shell instead of make for looping, make
	code more robust
2012-04-20 21:04:11 +02:00
Achim Gratz 6a3ec67abd Introduce $(datadir), prefix all installation paths with $(DESTDIR)
Makefile: remove includes for maintainer targets, these will go
	into local.mk on the server

	default.mk: introduce $(datadir) to replace $(etcdir) in etc/Makefile

	doc/Makefile: replace $etcdir) with $(datadir)

	lisp/Makefile: record ODT styles location as defconst in org-install

	{doc,etc,lisp}/Makefile: prefix all installation targets with $(DESTDIR)
2012-04-20 21:04:11 +02:00
Achim Gratz 0081071a52 create Makefile for etc/, some additions to .gitignore
* etc/Makefile: create, activate subdir "styles" for ODT exporter
	* .gitignore: ignore doc/git-describe.texi and .gitattributes
2012-04-20 21:04:10 +02:00
Jambunathan K 3f427d92c8 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-04-20 23:15:06 +05:30
Jambunathan K 030d1e5e62 * etc/styles/README: Update Copyright year 2012-04-20 22:45:59 +05:30
Jambunathan K 47175c99e9 OrgOdtStyles.xml: Fix indentation issues with description lists
* etc/styles/OrgOdtStyles.xml (OrgDescriptionList): Modify
style.  With this change, in a description list, if the
description paragraph spawns multiple lines then it will
correctly indented.
2012-04-20 22:45:50 +05:30
Jambunathan K bb291df296 org-e-odt: Handle caption/label for src blocks.
Add Listing-related entries to OrgOdtContentTemplate.xml,
OrgOdtStyles.xml.
2012-04-11 01:04:31 +05:30
Bastien Guerry 73bb18ba37 Manually revert to the Release 7.8.04 tag. 2012-03-17 15:52:24 +01:00
Bastien Guerry 552b0edb25 Manually revert to 78ec8e21 (Release 7.8.04)
Let's take a fresh start.  Sorry Mama.
2012-03-17 15:44:41 +01:00
Bastien Guerry fdc20f7792 Fix more copyright years. 2012-03-17 14:39:43 +01:00
Jambunathan K f2df757dae org-odt.el: By default, include page numbers in the page footer
* OrgOdtStyles.xml (OrgTitlePage): New page style.  Include no
footer.  Use "OrgFrontMatterPage" for the following page.
(OrgFrontMatterPage): New page style.  Include a footer that
displays page numbers in Roman style.  Use mirrored pages.
Use "OrgFrontMatterPage" for the following page.
(OrgPage): New page style.  Include a footer that displays
page numbers.  Use mirrored pages.  Use "OrgPage" for the
following page.
(OrgFirstPage): New page style.  Include a footer that
displays page numbers.  Right page only.  Use "OrgPage" for
the following page.
(Standard): Modify to include a footer that displays page
numbers.  Use mirrored pages.  Use "Standard" for the
following page.

None of the above page styles have a header.

The newly added page styles are not used as yet.
2012-01-30 14:04:40 +05:30
Jambunathan K bf1d5cfe95 Add support for indented tables in ODT export
* etc/styles/OrgOdtContentTemplate.xml
(OrgIndentedSection-Level-*): New section styles. These
sections are indented to the same level as the corresponding
list entries.  These sections hold tables that occur within a
list.
(OrgTable): Increased relative width from 90% to 96% for
aesthetic reasons.

* lisp/org-odt.el (org-odt-table-indentedp): New variable
(org-odt-begin-table): Modified.  If the table is within a
list, temporarily leave the list and begin an indented section
before emitting the table.
(org-odt-end-table): Modified.  If the table was within a
list, close the indented section and re-open the list
immediately after ending the table.
(org-odt-continue-list, org-odt-discontinue-list): Helper
routines to temporarily discontinue and continue a list.
(org-odt-list-stack-stashed): New variable to hold the state
of a pending list.
(org-odt-begin-list, org-odt-begin-list-item)
(org-odt-end-list-item): Modified. Handle nitty-gritties for
continuing a list and list item.
(org-odt-section-count): New variable that keeps track of
section count.  Used in conjunction with naming of sections.
(org-odt-begin-section, org-odt-end-section): New defuns.
(org-odt-init-outfile): Initialize
`org-odt-list-stack-stashed' and `org-odt-section-count'.

* lisp/org-lparse.el (org-lparse-list-item-count): Removed. Was a
superfluous variable.
(org-lparse-list-level): Removed.  Now derived from
`org-lparse-list-stack'.
(org-lparse-list-stack): New.  List that records the list
types - ordered, unordered or descriptive - in the following
order: self, parent, grand-parent etc.
(org-do-lparse): Added, removed above let-bound vars.
Disallowed regular tables within list-table block.
(org-lparse-begin-list, org-lparse-end-list)
(org-lparse-begin-list-item, org-lparse-end-list-item):
Propagate above changes.

OpenDocument doesn't permit tables to occur in the middle of a
list.  Use list continuations and indented sections to typeset
indented tables.

Fixes the following bug:
http://lists.gnu.org/archive/html/emacs-orgmode/2012-01/msg00515.html
2012-01-17 02:25:47 +05:30
Bastien Guerry 31aaa12c98 Fix tiny typo. 2012-01-05 09:29:43 +01:00
Bastien Guerry ad2f2df5db Fix copyright headers for etc/org/ files.
Rename etc/org/COPYRIGHT-AND-LICENSE to etc/org/README for consistency
with other copyright files, and add a reference to it in the .xml
files.

This changes have been made by Chong Yidong in Emacs trunk:
http://lists.gnu.org/archive/html/emacs-diffs/2012-01/msg00010.html
2012-01-04 11:06:50 +01:00
Bastien Guerry e44d2975ff Fix copyright (to 2012) year and Org version (to 7.8.03). 2012-01-03 18:47:01 +01:00
Jambunathan K 966d1e2b93 OrgOdtContentTemplate.xml: table-cells are now top aligned by default
* etc/styles/OrgOdtContentTemplate.xml (OrgTblCell): Modify
style:vertical-align attribute to top.
(OrgTblCell*): Inherit from OrgTblCell.
(Custom*TableCell): Force style:vertical-align to top.

See http://lists.gnu.org/archive/html/emacs-orgmode/2011-12/msg00780.html
2011-12-29 16:30:24 +05:30
Jambunathan K 2512637fce org-odt.el: Support for anchoring an image to a page
* etc/styles/OrgOdtStyles.xml(OrgPageImage)
(OrgPageImageCaptionFrame): New styles for anchoring an image
centrally on a page.

* lisp/org-odt.el (org-odt-entity-frame-styles): Accommodate new
frame styles: \"OrgPageImage\" and \"OrgPageImageCaptionFrame\".
(org-export-odt-format-image): Handle frame-related :anchor,
:style and :attributes options attached to images as shown
below:
		[[./image.png]]
(org-odt-merge-frame-params): New. Auxiliary routine to merge
the default frame params and user-specified frame params.
(org-odt-format-entity): Use the above
`org-odt-merge-frame-params'.

Jérémy Compostella <jeremy.compostella@gmail.com> writes:
  I need to add pictures that are anchored to the \"page\" and not
  to the \"paragraph\". This is very useful to get a \"floating
  picture\" on an entire page without text breaks.

He also adds:
  Sometimes, you want to add a picture but you don't want a page
  break. For example, you want to add a big illustration. To
  render correctly, the picture needs its own page but you don't
  want to break the page. In this case you need to anchor the
  picture to the \"page\".

http://lists.gnu.org/archive/html/emacs-orgmode/2011-11/msg00869.html
2011-12-26 16:03:25 +05:30
Jambunathan K f5add81f4b org-odt.el: Include author and date in the title
* lisp/org-odt.el (org-export-odt-default-org-styles-alist):
Add styles for title and subtitle.
(org-odt-format-toc): New.
(org-odt-format-preamble): New.  Users can redefine this to
customize what goes before the document body.  Currently it
outputs title, author and email, date and toc.
(org-odt-begin-document-body): Use `org-odt-format-preamble'.
(org-odt-format-date): Renamed from
`org-odt-iso-date-from-org-timestamp'.  Also added an
additional param for format string.
(org-odt-begin-annotation, org-odt-update-meta-file): Use
`org-odt-format-date'.

* etc/styles/OrgOdtStyles.xml (Title, OrgTitle, Subtitle)
(OrgSubtitle): New styles for formatting title.
2011-12-15 12:25:35 +05:30
Jambunathan K ff99056baf Makefile (PKG_FILES) : Include etc/
Also fix all byte-compiler warnings in org-lparse.el and org-odt.el.
2011-12-11 02:02:33 +05:30
Jambunathan K 23358285a4 Add copyright and license info for files in etc/styles/ 2011-12-10 18:13:14 +01:00
Jambunathan K 9c14e3d95e Move contrib/odt/styles/*.xml to etc/styles 2011-12-10 18:12:48 +01:00