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

w2l BibTeX bugfixes

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@262 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2015-07-01 07:11:19 +00:00
parent b5966134d5
commit 5e9dfc8678
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/java/writer2latex/bibtex/BibTeXDocument.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.6 (2015-06-22) * Version 1.6 (2015-07-01)
* *
*/ */
@ -65,6 +65,7 @@ public class BibTeXDocument implements OutputFile {
* @param ofr the office document * @param ofr the office document
*/ */
public BibTeXDocument(String sName, boolean bIsMaster, OfficeReader ofr) { public BibTeXDocument(String sName, boolean bIsMaster, OfficeReader ofr) {
this.sName = sName;
this.bIsMaster = bIsMaster; this.bIsMaster = bIsMaster;
loadEntries(ofr); loadEntries(ofr);
// Use default config (only ascii, no extra font packages) // Use default config (only ascii, no extra font packages)
@ -87,7 +88,7 @@ public class BibTeXDocument implements OutputFile {
* @return true if there is one or more entries in the document * @return true if there is one or more entries in the document
*/ */
public boolean isEmpty() { public boolean isEmpty() {
return entries.size()>0; return entries.size()==0;
} }
/** Get export name for an identifier /** Get export name for an identifier

8
source/java/writer2latex/latex/BibConverter.java
View file

@ -20,7 +20,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.6 (2015-06-22) * Version 1.6 (2015-07-01)
* *
*/ */
@ -59,6 +59,7 @@ import writer2latex.util.Misc;
class BibConverter extends ConverterHelper { class BibConverter extends ConverterHelper {
private BibTeXDocument bibDoc = null; private BibTeXDocument bibDoc = null;
private boolean bUseBibTeX;
/** Construct a new BibConverter. /** Construct a new BibConverter.
* *
@ -72,6 +73,9 @@ class BibConverter extends ConverterHelper {
if (!(config.useBibtex() && config.externalBibtexFiles().length()>0)) { if (!(config.useBibtex() && config.externalBibtexFiles().length()>0)) {
bibDoc = new BibTeXDocument(palette.getOutFileName(),false,ofr); bibDoc = new BibTeXDocument(palette.getOutFileName(),false,ofr);
} }
// We need to export it
bUseBibTeX = config.useBibtex();
} }
/** Export the bibliography directly as a thebibliography environment (as an alternative to using BibTeX) /** Export the bibliography directly as a thebibliography environment (as an alternative to using BibTeX)
@ -228,7 +232,7 @@ class BibConverter extends ConverterHelper {
* @return the BiBTeXDocument, or null if no BibTeX file is needed * @return the BiBTeXDocument, or null if no BibTeX file is needed
*/ */
BibTeXDocument getBibTeXDocument() { BibTeXDocument getBibTeXDocument() {
if (bibDoc!=null && !bibDoc.isEmpty()) { if (bUseBibTeX && bibDoc!=null && !bibDoc.isEmpty()) {
return bibDoc; return bibDoc;
} }
return null; return null;