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

Some minor edits prior to 1.6 beta release

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@269 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2018-03-06 15:09:03 +00:00
parent 3d079375d1
commit 3f39190386
9 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.xml
View file

@ -2,7 +2,7 @@
############################################################################ ############################################################################
# This is the Ant build file for writer2latex # This is the Ant build file for writer2latex
# Original: Sep 2004 (mgn) # Original: Sep 2004 (mgn)
# version 1.6 (2015-07-22) # version 1.6 (2018-03-06)
############################################################################ ############################################################################
--> -->
<project name="w2l" default="help" basedir="."> <project name="w2l" default="help" basedir=".">
@ -10,8 +10,6 @@
<!-- set this property to the location of your SO/OOo installation --> <!-- set this property to the location of your SO/OOo installation -->
<property name="OFFICE_CLASSES" location="/usr/share/java" /> <property name="OFFICE_CLASSES" location="/usr/share/java" />
<property name="URE_CLASSES" location="/usr/share/java" /> <property name="URE_CLASSES" location="/usr/share/java" />
<!-- set this property to the location of the java 6 bootstrap classes (rt.jar) -->
<property name="JAVA6_RT_JAR" location="/home/hj/jre6/lib/rt.jar" />
<description>writer2latex - build file</description> <description>writer2latex - build file</description>
@ -77,10 +75,9 @@
<javac srcdir="${src}" <javac srcdir="${src}"
destdir="${classes}" destdir="${classes}"
encoding="us-ascii" encoding="us-ascii"
source="1.6" source="1.8"
target="1.6" target="1.8"
classpath="${source.lib}/${org.json}:${source.lib}/${org.jbibtex}" classpath="${source.lib}/${org.json}:${source.lib}/${org.jbibtex}"
bootclasspath="${JAVA6_RT_JAR}"
includeantruntime="false" includeantruntime="false"
debug="on"> debug="on">
<classpath refid="main.class.path"/> <classpath refid="main.class.path"/>

4
source/distro/changelog.txt
View file

@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
---------- version 1.6 beta ---------- ---------- version 1.6 beta ----------
[w2l] Removed remark about JabRef plugin for LO from help file, as the functionality is now native in JabRef
[w2l] Enabled export of WMF and EMF graphics to PDF (was disabled due to bugs in earlier versions of LO) [w2l] Enabled export of WMF and EMF graphics to PDF (was disabled due to bugs in earlier versions of LO)
[w2x] In the BibTeX dialog, updating references generates a status message. This is now moved from a message box [w2x] In the BibTeX dialog, updating references generates a status message. This is now moved from a message box
@ -17,8 +19,6 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
Also, the default bibtex application has been changed to bibtex8 (but currently no attempt is made to select the Also, the default bibtex application has been changed to bibtex8 (but currently no attempt is made to select the
proper .csf file) proper .csf file)
---------- version 1.5.3 ----------
[w2l] The command \textsubscript is now defined with \providecommand to avoid problems with other packages that may [w2l] The command \textsubscript is now defined with \providecommand to avoid problems with other packages that may
already have defined this command already have defined this command

BIN
source/distro/doc/user-manual.odt
View file

Binary file not shown.

6
source/java/org/openoffice/da/comp/w2lcommon/filter/UNOPublisher.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-2015 by Henrik Just * Copyright: 2002-2018 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.6 (2015-05-28) * Version 1.6 (2018-03-06)
* *
*/ */
package org.openoffice.da.comp.w2lcommon.filter; package org.openoffice.da.comp.w2lcommon.filter;
@ -160,7 +160,7 @@ public class UNOPublisher {
/** Post process the document after conversion. /** Post process the document after conversion.
* *
* @param format URL of the converted document * @param sTargetURL URL of the converted document
* @param format the target format * @param format the target format
*/ */
protected void postProcess(String sTargetURL, TargetFormat format) { protected void postProcess(String sTargetURL, TargetFormat format) {

6
source/java/org/openoffice/da/comp/writer2latex/ExternalApps.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-2015 by Henrik Just * Copyright: 2002-2018 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.6 (2015-05-29) * Version 1.6 (2018-03-06)
* *
*/ */
@ -151,7 +151,7 @@ public class ExternalApps {
/** Define to use the system's default for an external application. This is only possible if the application is a viewer, /** Define to use the system's default for an external application. This is only possible if the application is a viewer,
* otherwise setting the value to true will be ignored * otherwise setting the value to true will be ignored
* @param sAppName the name of the application * @param sAppName the name of the application
* @param sUseDefault flag defining whether or not to use the default * @param bUseDefault flag defining whether or not to use the default
*/ */
public void setUseDefaultApplication(String sAppName, boolean bUseDefault) { public void setUseDefaultApplication(String sAppName, boolean bUseDefault) {
if (bUseDefault && isViewer(sAppName)) { if (bUseDefault && isViewer(sAppName)) {

6
source/java/writer2latex/api/ConverterFactory.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-2015 by Henrik Just * Copyright: 2002-2018 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.6 (2015-07-28) * Version 1.6 (2018-03-06)
* *
*/ */
@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information // Version information
private static final String VERSION = "1.6"; private static final String VERSION = "1.6";
private static final String DATE = "2015-07-28"; private static final String DATE = "2018-03-06";
/** 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/base/BibliographyGenerator.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-2015 by Henrik Just * Copyright: 2002-2018 by Henrik Just
* *
* All Rights Reserved. * All Rights Reserved.
* *
* Version 1.6 (2015-06-20) * Version 1.6 (2018-03-06)
* *
*/ */
@ -196,7 +196,7 @@ public abstract class BibliographyGenerator {
/** Generate a bibliography /** Generate a bibliography
* *
* @param bibliography a text:bibliography-source element * @param bibSource a text:bibliography-source element
*/ */
protected void generateBibliography(Element bibSource) { protected void generateBibliography(Element bibSource) {
Map<String,Element> bibEntryTemplate = collectTemplates(bibSource); Map<String,Element> bibEntryTemplate = collectTemplates(bibSource);

2
source/oxt/w2lconfig/description.xml
View file

@ -16,7 +16,7 @@
<display-name> <display-name>
<name lang="da">Writer2LaTeX konfigurationer</name> <name lang="da">Writer2LaTeX konfigurationer</name>
<name lang="en">Writer4LaTeX configurations</name> <name lang="en">Writer2LaTeX configurations</name>
</display-name> </display-name>
<extension-description> <extension-description>

11
source/oxt/writer2latex/help/en/org.openoffice.da.writer2latex.oxt/bibliography.xhp
View file

@ -95,11 +95,11 @@
folder.</paragraph> folder.</paragraph>
<paragraph role="paragraph" xml-lang="en-US">The Writer2LaTeX distribution contains a folder named <emph>Zotero</emph>, <paragraph role="paragraph" xml-lang="en-US">The Writer2LaTeX distribution contains a folder named <emph>Zotero</emph>,
which contains a file called <emph>BibTeX-Writer2LaTeX.js</emph>. This file must be added to Zotero to provide a suitable which contains a file called <emph>BibTeX-Writer2LaTeX.js</emph>. This file must be added to Zotero to provide a suitable
BibTeX export: In Zotero, choose <emph>Preferences</emph> - <emph>Advanced</emph> and click <emph>Show Data Directory</emph>. BibTeX export: In Zotero, choose <emp>Edit</emph> - <emph>Preferences</emph> - <emph>Advanced</emph> and click <emph>Show Data Directory</emph>.
Open the subfolder <emph>Translators</emph>, and copy <emph>BibTeX-Writer2LaTeX.js</emph> to this location. Open the subfolder <emph>Translators</emph>, and copy <emph>BibTeX-Writer2LaTeX.js</emph> to this location.
Finally restart Firefox.</paragraph> Finally restart Zotero.</paragraph>
<paragraph role="paragraph" xml-lang="en-US">You can now export your Zotero database: In Zotero, select <paragraph role="paragraph" xml-lang="en-US">You can now export your Zotero database: In Zotero, select
<emph>Export Library</emph>, and choose <emph>BibTeX (Writer2LaTeX)</emph> (not <emph>BibTeX</emph>). <emph>File</emph> - <emph>Export Library</emph>, and choose <emph>BibTeX (Writer2LaTeX)</emph> (not <emph>BibTeX</emph>).
Save the file in the folder, you have defined.</paragraph> Save the file in the folder, you have defined.</paragraph>
<paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibliographyConvertZoteroCitations" visibility="hidden">Check this to convert Zotero citations to LaTeX</ahelp></paragraph> <paragraph role="paragraph" xml-lang="en-US"><ahelp hid="org.openoffice.da.writer2latex.oxt:BibliographyConvertZoteroCitations" visibility="hidden">Check this to convert Zotero citations to LaTeX</ahelp></paragraph>
@ -109,9 +109,8 @@
is an open source bibliography reference manager using BibTeX as native file format. is an open source bibliography reference manager using BibTeX as native file format.
You can use JabRef to edit your BibTeX files. You can use JabRef to edit your BibTeX files.
In addition JabRef provides a <link href="http://jabref.sourceforge.net/OOPlugin-jabref.php" name="JabRef OOo plugin">plugin</link> In addition JabRef permits you to insert citations directly from JabRef in your %PRODUCTNAME Writer document
which permits you to insert citations from JabRef in your %PRODUCTNAME Writer document using a selection of citation schemes.</paragraph>
using a selection of citation schemes. You should use version 0.8.999 beta or later of the plugin.</paragraph>
<paragraph role="paragraph" xml-lang="en-US">Check this if you want to convert JabRef citations to LaTeX. <paragraph role="paragraph" xml-lang="en-US">Check this if you want to convert JabRef citations to LaTeX.
This enables you to format the citations using a BibTeX style of your choice. This enables you to format the citations using a BibTeX style of your choice.
Also, the bibliography created by JabRef will be replaced with a BibTeX-generated bibliography. Also, the bibliography created by JabRef will be replaced with a BibTeX-generated bibliography.