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

w2x fix for infinite loop (bugtracker#4)

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@258 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2015-06-23 20:11:50 +00:00
parent 729e088fa2
commit 1d33ea6222
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/distro/changelog.txt
View file

@ -2,9 +2,12 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
---------- version 1.5.3 ---------- ---------- version 1.5.3 ----------
[w2x] Bugfix: writer2latex.xhtml.TableConverter.borderWidth ran into an infinite loop if border shorthand properties
didn't begin with width, but e.g. with colour (e.g. "#000000 0.035cm solid").
See bug tracker #4 fix for infinite loop in writer2latex.xhtml.TableConverter.borderWidth
[w2l] If use_bibtex is false, the bibliography is now exported using a thebibliography environment rather than as [w2l] If use_bibtex is false, the bibliography is now exported using a thebibliography environment rather than as
plain text plain text
TODO: Debugging and test
[w2x] The bibliography is now regenerated from the template. This implies that bibliographic citations now link [w2x] The bibliography is now regenerated from the template. This implies that bibliographic citations now link
directly to the cited work rather than to the bibliography as a whole. directly to the cited work rather than to the bibliography as a whole.

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

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.6 (2015-06-19) * Version 1.6 (2015-06-23)
* *
*/ */
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information // Version information
private static final String VERSION = "1.5.3"; private static final String VERSION = "1.5.3";
private static final String DATE = "2015-06-19"; private static final String DATE = "2015-06-23";
/** 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/>

6
source/java/writer2latex/xhtml/TableConverter.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-2012 by Henrik Just * Copyright: 2002-2015 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.4 (2012-04-12) * Version 1.6 (2015-06-23)
* *
*/ */
@ -478,7 +478,7 @@ public class TableConverter extends ConverterHelper {
return in.getNumber()+in.getIdentifier(); return in.getNumber()+in.getIdentifier();
} }
// skip other characters // skip other characters
while (in.peekChar()!=' ' && in.peekChar()!='\0') { } while (in.peekChar()!=' ' && in.peekChar()!='\0') { in.getChar(); }
} }
return "0"; return "0";
} }