From 4a63a1ce8c86fa72d32d7d740448e58e53574cc0 Mon Sep 17 00:00:00 2001 From: henrikjust Date: Mon, 21 Mar 2011 10:40:02 +0000 Subject: [PATCH] W2X relative image size git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@100 f0f2a975-2e09-46c8-9428-3b39399b9f3c --- build.xml | 2 +- source/distro/changelog.txt | 4 + source/distro/doc/user-manual.odt | Bin 51946 -> 51998 bytes .../comp/writer2xhtml/EpubOptionsDialog.java | 13 +- .../comp/writer2xhtml/XhtmlOptionsDialog.java | 10 +- .../writer2xhtml/XhtmlOptionsDialogCalc.java | 10 +- .../writer2latex/api/ConverterFactory.java | 4 +- source/java/writer2latex/util/Misc.java | 15 +- source/java/writer2latex/xhtml/Converter.java | 26 ++- .../writer2latex/xhtml/DrawConverter.java | 201 +++++++++++------- .../xhtml/PageStyleConverter.java | 31 ++- .../writer2latex/xhtml/TableConverter.java | 11 +- .../java/writer2latex/xhtml/XhtmlConfig.java | 29 ++- source/oxt/writer2xhtml/Options.xcs | 2 +- source/oxt/writer2xhtml/Options.xcu | 4 +- .../writer2xhtml/W2XDialogs2/EpubOptions.xdl | 59 ++--- .../epub_export.xhp | 21 +- .../export.xhp | 2 +- 18 files changed, 306 insertions(+), 138 deletions(-) diff --git a/build.xml b/build.xml index 8636ebc..b1e9f5f 100644 --- a/build.xml +++ b/build.xml @@ -254,7 +254,7 @@ - + diff --git a/source/oxt/writer2xhtml/Options.xcu b/source/oxt/writer2xhtml/Options.xcu index 003ef84..7315009 100644 --- a/source/oxt/writer2xhtml/Options.xcu +++ b/source/oxt/writer2xhtml/Options.xcu @@ -70,8 +70,8 @@ 100 - - false + + 1 true diff --git a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl index 7351a51..41495da 100755 --- a/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl +++ b/source/oxt/writer2xhtml/W2XDialogs2/EpubOptions.xdl @@ -16,20 +16,19 @@ - + - - + - + - + - - + + @@ -39,41 +38,41 @@ - - - - + + + + - + - + - + - + - - + + - - + + - - - - + + + + @@ -87,10 +86,18 @@ - - - + + + + + + + + + + + \ No newline at end of file diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp index e80a0d6..769d27d 100644 --- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/epub_export.xhp @@ -81,9 +81,24 @@ all dimensions are converted to px. - - Check this to use the natural size of images rather than the size defined in the document - + + Select how to set the image size in the EPUB document + Select how to set the image size in the EPUB document + + + Use absolute size: Images will get the same size in the EPUB + document as in the original %PRODUCTNAME Writer document. + + + Use relative size (%): Image sizes will be exported as + percentages. This has the advantage that the image size will adapt to the size of the reader screen. + + + Use original image size: Often images in a %PRODUCTNAME document + are scaled up or down from their original size. If you select this option, the original (unscaled) image + size will be used. + + AutoCorrect diff --git a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp index e579855..b5dca0a 100644 --- a/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp +++ b/source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/export.xhp @@ -65,7 +65,7 @@
Using this option you can define a percentage used to scale all dimensions. Thus with the setting 140, all dimensions will be 40% larger than in the original document. Depending on the - style you have selected and on the option Use original image size, some dimensions may be unaffected by + style you have selected and on the setting for image size below, some dimensions may be unaffected by this option.