litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

w2l bugfix: Export headings in footnotes as ordinary texts

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@127 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2012-02-22 08:42:40 +00:00
parent 2adc68ed46
commit c1d0cd4bf7
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/distro/changelog.txt
View file

@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
---------- version 1.1.9 ---------- ---------- version 1.1.9 ----------
[w2l] Bugfix: Ignore headings inside footnotes (export as normal paragraph). Footnotes should not contain headings, and this
change avoids an infinite loop if such a footnote is within a table.
[w2l] Fixed bugs on the "Text and Math" options page (controls were not updated correctly leading to erratic behavior) [w2l] Fixed bugs on the "Text and Math" options page (controls were not updated correctly leading to erratic behavior)
[w2l] Added support for the font "Greek" [w2l] Added support for the font "Greek"

4
source/java/writer2latex/api/ConverterFactory.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2011-09-20) * Version 1.2 (2012-02-22)
* *
*/ */
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information // Version information
private static final String VERSION = "1.1.9"; private static final String VERSION = "1.1.9";
private static final String DATE = "2011-09-20"; private static final String DATE = "2012-02-22";
/** Return the Writer2LaTeX version in the form /** Return the Writer2LaTeX version in the form
* (major version).(minor version).(patch level)<br/> * (major version).(minor version).(patch level)<br/>

11
source/java/writer2latex/latex/NoteConverter.java
View file

@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright: 2002-2010 by Henrik Just * Copyright: 2002-2012 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.2 (2010-11-21) * Version 1.2 (2012-02-22)
* *
*/ */
@ -273,11 +273,8 @@ public class NoteConverter extends ConverterHelper {
palette.getInfo().addDebugInfo(child,ldp); palette.getInfo().addDebugInfo(child,ldp);
if (nodeName.equals(XMLString.TEXT_H)) { // Headings inside footnotes are considere a mistake and exported as ordinary paragraphs
palette.getHeadingCv().handleHeading(child,ldp,oc); if (nodeName.equals(XMLString.TEXT_H) || nodeName.equals(XMLString.TEXT_P)) {
}
if (nodeName.equals(XMLString.TEXT_P)) {
StyleWithProperties style = ofr.getParStyle(node.getAttribute(XMLString.TEXT_STYLE_NAME)); StyleWithProperties style = ofr.getParStyle(node.getAttribute(XMLString.TEXT_STYLE_NAME));
oc.resetFormattingFromStyle(style); oc.resetFormattingFromStyle(style);
palette.getInlineCv().traverseInlineText(child,ldp,oc); palette.getInlineCv().traverseInlineText(child,ldp,oc);