diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index 4e1b200..db1ce02 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -2,6 +2,9 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
---------- version 1.5.1 ----------
+[w4l] Replaced menu with a toolbar with four buttons: Insert BibTeX citation (not yet implemented), publish to LaTeX,
+ view log files and edit custom format. (Publishing without showing the dialog is currently removed.)
+
[w2x] Added toolbar with four buttons: Publish directly to XHTML, publish directly to EPUB, edit EPUB metadata
and edit custom configuration. Publishing directly implies that the export dialog is not displayed. Instead
the document will be exported to the same directory as the currently open document and with the same name.
diff --git a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
index 9bb432f..ae0e80d 100644
--- a/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
+++ b/source/java/org/openoffice/da/comp/writer4latex/Writer4LaTeX.java
@@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- * Copyright: 2002-2011 by Henrik Just
+ * Copyright: 2002-2014 by Henrik Just
*
* All Rights Reserved.
*
- * Version 1.2 (2011-03-23)
+ * Version 1.6 (2014-10-23)
*
*/
@@ -134,6 +134,8 @@ public final class Writer4LaTeX extends WeakBase
return this;
else if ( aURL.Path.compareTo("ViewLog") == 0 )
return this;
+ else if ( aURL.Path.compareTo("InsertBibTeX") == 0 )
+ return this;
}
return null;
}
@@ -174,6 +176,10 @@ public final class Writer4LaTeX extends WeakBase
viewLog();
return;
}
+ else if ( aURL.Path.compareTo("InsertBibTeX") == 0 ) {
+ insertBibTeX();
+ return;
+ }
}
}
@@ -339,6 +345,11 @@ public final class Writer4LaTeX extends WeakBase
}
}
}
+
+ private void insertBibTeX() {
+ MessageBox msgBox = new MessageBox(m_xContext, m_xFrame);
+ msgBox.showMessage("Writer4LaTeX","This feature is not implemented yet");
+ }
// Some utility methods
private void prepareMediaProperties() {
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index 8ce439f..e0f75e5 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -20,7 +20,7 @@
*
* All Rights Reserved.
*
- * Version 1.6 (2014-10-22)
+ * Version 1.6 (2014-10-23)
*
*/
@@ -33,7 +33,7 @@ public class ConverterFactory {
// Version information
private static final String VERSION = "1.5.1";
- private static final String DATE = "2014-10-22";
+ private static final String DATE = "2014-10-23";
/** Return the Writer2LaTeX version in the form
* (major version).(minor version).(patch level)
diff --git a/source/oxt/writer4latex/Addons.xcu b/source/oxt/writer4latex/Addons.xcu
index 3008089..56daf13 100644
--- a/source/oxt/writer4latex/Addons.xcu
+++ b/source/oxt/writer4latex/Addons.xcu
@@ -2,78 +2,82 @@
-
-
-
- com.sun.star.text.TextDocument
-
-
- LaTe~X
-
-
- _self
-
-
-
-
-
-
-
- com.sun.star.text.TextDocument
-
-
- Run ~LaTeX...
- Kør ~LaTeX...
-
-
- _self
-
-
- org.openoffice.da.writer4latex:ProcessDocument
-
-
-
-
-
-
-
- com.sun.star.text.TextDocument
-
-
- Run LaTe~X directly
- Kør LaTe~X direkte
-
-
- _self
-
-
- org.openoffice.da.writer4latex:ProcessDirectly
-
-
-
-
-
-
-
- com.sun.star.text.TextDocument
-
-
- View Lo~g files
- Vis lo~gfiler
-
-
- _self
-
-
- org.openoffice.da.writer4latex:ViewLog
-
-
-
-
-
-
-
-
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Insert BibTeX citation
+ Indsæt BibTeX-reference
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:InsertBibTeX
+
+
+ %origin%/icons/bibtex
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Publish to LaTeX
+ Publicer til LaTeX
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:ProcessDocument
+
+
+ %origin%/icons/latex
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ View log files
+ Vis logfiler
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:ViewLog
+
+
+ %origin%/icons/log
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Edit custom format
+ Rediger brugerdefineret format
+
+
+ _self
+
+
+ .uno:OptionsTreeDialog?OptionsPageURL:string=%origin%/W2LDialogs2/Documentclass.xdl
+
+
+ %origin%/icons/custom
+
+
+
+
\ No newline at end of file
diff --git a/source/oxt/writer4latex/AddonsAOO4.xcu b/source/oxt/writer4latex/AddonsAOO4.xcu
new file mode 100644
index 0000000..507a46d
--- /dev/null
+++ b/source/oxt/writer4latex/AddonsAOO4.xcu
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+ Writer4LaTeX
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Insert BibTeX citation
+ Indsæt BibTeX-reference
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:InsertBibTeX
+
+
+ %origin%/icons/bibtex
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Publish to LaTeX
+ Publicer til LaTeX
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:ProcessDocument
+
+
+ %origin%/icons/latex
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ View log files
+ Vis logfiler
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:ViewLog
+
+
+ %origin%/icons/log
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Edit custom format
+ Rediger brugerdefineret format
+
+
+ _self
+
+
+ .uno:OptionsTreeDialog?OptionsPageURL:string=%origin%/W2LDialogs2/Documentclass.xdl
+
+
+ %origin%/icons/custom
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/oxt/writer4latex/META-INF/manifest.xml b/source/oxt/writer4latex/META-INF/manifest.xml
index 5c0c6d2..bc0142a 100644
--- a/source/oxt/writer4latex/META-INF/manifest.xml
+++ b/source/oxt/writer4latex/META-INF/manifest.xml
@@ -8,6 +8,14 @@
+
+
+
+
+
+
+
+
+
+ Writer4LaTeX
+
+
+
+
+
\ No newline at end of file
diff --git a/source/oxt/writer4latex/W4LDialogs/Addons.xcu b/source/oxt/writer4latex/W4LDialogs/Addons.xcu
new file mode 100644
index 0000000..56daf13
--- /dev/null
+++ b/source/oxt/writer4latex/W4LDialogs/Addons.xcu
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Insert BibTeX citation
+ Indsæt BibTeX-reference
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:InsertBibTeX
+
+
+ %origin%/icons/bibtex
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Publish to LaTeX
+ Publicer til LaTeX
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:ProcessDocument
+
+
+ %origin%/icons/latex
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ View log files
+ Vis logfiler
+
+
+ _self
+
+
+ org.openoffice.da.writer4latex:ViewLog
+
+
+ %origin%/icons/log
+
+
+
+
+ com.sun.star.text.TextDocument
+
+
+ Edit custom format
+ Rediger brugerdefineret format
+
+
+ _self
+
+
+ .uno:OptionsTreeDialog?OptionsPageURL:string=%origin%/W2LDialogs2/Documentclass.xdl
+
+
+ %origin%/icons/custom
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/source/oxt/writer4latex/icons/bibtex_16.bmp b/source/oxt/writer4latex/icons/bibtex_16.bmp
new file mode 100644
index 0000000..03b12cb
Binary files /dev/null and b/source/oxt/writer4latex/icons/bibtex_16.bmp differ
diff --git a/source/oxt/writer4latex/icons/bibtex_26.bmp b/source/oxt/writer4latex/icons/bibtex_26.bmp
new file mode 100644
index 0000000..6687557
Binary files /dev/null and b/source/oxt/writer4latex/icons/bibtex_26.bmp differ
diff --git a/source/oxt/writer4latex/icons/custom_16.bmp b/source/oxt/writer4latex/icons/custom_16.bmp
new file mode 100644
index 0000000..51656ae
Binary files /dev/null and b/source/oxt/writer4latex/icons/custom_16.bmp differ
diff --git a/source/oxt/writer4latex/icons/custom_26.bmp b/source/oxt/writer4latex/icons/custom_26.bmp
new file mode 100644
index 0000000..2fecb2b
Binary files /dev/null and b/source/oxt/writer4latex/icons/custom_26.bmp differ
diff --git a/source/oxt/writer4latex/icons/latex_16.bmp b/source/oxt/writer4latex/icons/latex_16.bmp
new file mode 100644
index 0000000..2a3b272
Binary files /dev/null and b/source/oxt/writer4latex/icons/latex_16.bmp differ
diff --git a/source/oxt/writer4latex/icons/latex_26.bmp b/source/oxt/writer4latex/icons/latex_26.bmp
new file mode 100644
index 0000000..fb3b506
Binary files /dev/null and b/source/oxt/writer4latex/icons/latex_26.bmp differ
diff --git a/source/oxt/writer4latex/icons/log_16.bmp b/source/oxt/writer4latex/icons/log_16.bmp
new file mode 100644
index 0000000..88f3b37
Binary files /dev/null and b/source/oxt/writer4latex/icons/log_16.bmp differ
diff --git a/source/oxt/writer4latex/icons/log_26.bmp b/source/oxt/writer4latex/icons/log_26.bmp
new file mode 100644
index 0000000..1539a64
Binary files /dev/null and b/source/oxt/writer4latex/icons/log_26.bmp differ