[PATCH 17/17] XHTML export: remove 'odfLiEnd'
From: Andrew Sayers
Inserting space to work around an IE6/7 bug does more harm than good nowadays.
---
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 6 --
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 5 -
2 files changed, 11 deletions(-)
diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index bbf90d5..245da83 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2559,9 +2559,6 @@
-
-
-
@@ -2628,9 +2625,6 @@
-
-
-
diff --git filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index f76c451..d0db766 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -99,11 +99,6 @@
li { list-style: none; margin:0; padding:0;}
- "li span.odfLiEnd" - IE 7 issue
-
-
-li span. { clear: both; line-height:0; width:0; height:0; margin:0;
padding:0; }
-
span.footnodeNumber { padding-right:1em; }
span.annotation_style_by_filter { font-size:95%; font-family:Arial;
background-color:#fff000; margin:0; border:0; padding:0; }
--
1.8.5.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 09/17] XHTML export: Add markup and styles for page-breaks
From: Andrew Sayers --- filter/source/xslt/odf2xhtml/export/common/body.xsl | 2 +- .../xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl | 6 ++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 6 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl filter/source/xslt/odf2xhtml/export/common/body.xsl index facc174..cfb464f 100644 --- filter/source/xslt/odf2xhtml/export/common/body.xsl +++ filter/source/xslt/odf2xhtml/export/common/body.xsl @@ -417,7 +417,7 @@ - + diff --git filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl index b99a781..822ba0b 100644 --- filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl +++ filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl @@ -73,6 +73,12 @@ + + break-before: + + ; + + clear:both; diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index fdc4e19..46c0a7c 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -205,6 +205,12 @@ + + + break-before:page + + + -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 11/17] XHTML export: Mildly sanitise bullet points
From: Andrew Sayers
---
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 14 +++---
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 46c0a7c..5df5cd4 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2014,13 +2014,15 @@
The represents the list item/header label (e.g. 1.A.III).
We use CSS to make the a block element, to set its width, and to float
in the correct place -->
-
-
+
+
bullet
+
+
-
-
+
+
-
display:block;float:
+
float:
@@ -2046,9 +2048,7 @@
-
-
diff --git filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 98ee59b..f76c451 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -108,6 +108,8 @@
span.annotation_style_by_filter { font-size:95%; font-family:Arial;
background-color:#fff000; margin:0; border:0; padding:0; }
+li span.bullet {display:block}
+
* { margin:0;}
--
1.8.5.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 15/17] XHTML export: hide unhelpful comments
From: Andrew Sayers --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 26 +++--- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 1126f8e..60b5808 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -250,7 +250,7 @@ - Next 'div' was a 'draw:text-box'. + Next 'div' was a 'draw:text-box'. @@ -374,10 +374,10 @@ - Next 'div' was a 'text:p'. + Next 'div' was a 'text:p'. - Next 'div' was a 'draw:page'. + Next 'div' was a 'draw:page'. @@ -801,7 +801,7 @@ - Next 'div' added for floating. + Next 'div' added for floating. position:relative; left: @@ -991,7 +991,7 @@ - Next 'div' is emulating the top hight of a draw:frame. + Next 'div' is emulating the top hight of a draw:frame. @@ -2775,7 +2775,7 @@ - Next 'div' was a 'text:section'. + Next 'div' was a 'text:section'. @@ -2800,11 +2800,11 @@ - + - + -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 04/17] XHML Export: break incredibly long line
From: Andrew Sayers `git send-email` requires the `--no-validate` option to send patches with lines that break RFC 2281's 998 character line-length limit. Breaking the line up removes a hurdle for future developers. --- As this patch is being sent by e-mail, obviously there's a chance some program along the chain will corrupt it. This patch was created simply by running 's/" /"\r/g' on the appropriate line of the file. If the patch has been corrupted, you should be able to recreate it the same way. .../source/xslt/odf2xhtml/export/common/body.xsl | 30 +- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl filter/source/xslt/odf2xhtml/export/common/body.xsl index 4353c7c..b2cc5d0 100644 --- filter/source/xslt/odf2xhtml/export/common/body.xsl +++ filter/source/xslt/odf2xhtml/export/common/body.xsl @@ -19,7 +19,35 @@ -http://www.w3.org/1999/XSL/Transform"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:s tyle="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:java="http://xml.apache.org/xslt/java"; xmlns:urlencoder="http://www.jclark.com/xt/java/java.net.URLEncoder"; exclude-result-prefixes="chart config dc dom dr3d draw fo form math meta number office ooo oooc ooow script style svg table text xforms xlink xsd xsi java urlencoder"> +http://www.w3.org/1999/XSL/Transform"; +xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" +xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" +xmlns:dc="http://purl.org/dc/elements/1.1/"; +xmlns:dom="http://www.w3.org/2001/xml-events"; +xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" +xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" +xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" +xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" +xmlns:math="http://www.w3.org/1998/Math/MathML"; +xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" +xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" +xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" +xmlns:ooo="http://openoffice.org/2004/office"; +xmlns:oooc="http://openoffice.org/2004/calc"; +xmlns:ooow="http://openoffice.org/2004/writer"; +xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" +xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" +xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" +xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" +xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" +xmlns:xforms="http://www.w3.org/2002/xforms"; +xmlns:xlink="http://www.w3.org/1999/xlink"; +xmlns:xsd="http://www.w3.org/2001/XMLSchema"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xmlns:java="http://xml.apache.org/xslt/java"; +xmlns:urlencoder="http://www.jclark.com/xt/java/java.net.URLEncoder"; +exclude-result-prefixes="chart config dc dom dr3d draw fo form math meta number office ooo oooc ooow script style svg table text xforms xlink xsd xsi java urlencoder"> -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 02/17] XHTML export: improve comments
From: Andrew Sayers --- .../export/common/styles/style_collector.xsl | 2 +- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 45 +++--- .../source/xslt/odf2xhtml/export/xhtml/table.xsl | 4 +- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl index 9b02d94..69d34a4 100644 --- filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl +++ filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl @@ -661,7 +661,7 @@ - + diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 3ecde5e..6f3e980 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -433,8 +433,8 @@ + OOo writes out empty paragraphs laid out behind an image (= draw:image within draw:frame), + those must be neglected in HTML --> @@ -479,7 +479,7 @@ + @@ -630,15 +630,15 @@ - - @@ -729,8 +729,8 @@ - + @@ -790,9 +790,9 @@ - + Next 'div' added for floating. @@ -803,7 +803,7 @@ - + @@ -1325,7 +1325,7 @@ and preceding siblings of 'text:h' with the same 'text:outline-level' (until a text:outline-level with lower value is found). If the 'text:start-value is not set the default value of '1' has to be taken. If a heading number is found (e.g. text:outline-level='3') all heading numbers - for the higher levels have to be written out --> + for the higher levels must be written out --> @@ -2004,10 +2004,9 @@ - + @@ -2046,8 +2045,8 @@ - + @@ -2186,7 +2185,7 @@ + but must be reused on following items with no text:start-value -->
[PATCH 05/17] XHTML export: convert DOS newlines to Unix newlines
From: Andrew Sayers --- .../source/xslt/odf2xhtml/export/common/body.xsl | 798 ++--- .../export/common/styles/style_mapping_css.xsl | 666 - 2 files changed, 732 insertions(+), 732 deletions(-) diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl filter/source/xslt/odf2xhtml/export/common/body.xsl index b2cc5d0..facc174 100644 --- filter/source/xslt/odf2xhtml/export/common/body.xsl +++ filter/source/xslt/odf2xhtml/export/common/body.xsl @@ -1,4 +1,4 @@ - + - + http://www.w3.org/1999/XSL/Transform"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" @@ -47,402 +47,402 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:java="http://xml.apache.org/xslt/java"; xmlns:urlencoder="http://www.jclark.com/xt/java/java.net.URLEncoder"; -exclude-result-prefixes="chart config dc dom dr3d draw fo form math meta number office ooo oooc ooow script style svg table text xforms xlink xsd xsi java urlencoder"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - margin-left:cm - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[PATCH 01/17] XSLT: Better error messages in measure_conversion.xsl
From: Andrew Sayers --- Hi LibreOffice, Earlier this year I needed to do some work with HTML document export. This patchset represents the sundry improvements I made along the way. The code has been stable for a while now, so I've rebased it and sent it in. I don't expect to make any more changes at this point, Murphy notwithstanding. Note: some of these patches deal with trailing spaces and mixed Windows/Unix newlines. To make the patches cleanly apply, I needed to do: git am -p0 --keep-cr patches/* filter/source/xslt/common/measure_conversion.xsl | 48 1 file changed, 40 insertions(+), 8 deletions(-) diff --git filter/source/xslt/common/measure_conversion.xsl filter/source/xslt/common/measure_conversion.xsl index 2828f4b..f808fa3 100644 --- filter/source/xslt/common/measure_conversion.xsl +++ filter/source/xslt/common/measure_conversion.xsl @@ -125,8 +125,12 @@ + + measure_conversion.xsl: Empty string passed for unit when when converting to to 'mm' - passing unmodified value back + + - measure_conversion.xsl: Find no conversion for to 'mm'! + unrecognised value '' passed to 'convert2mm' - please update measure_conversion.xsl to handle this unit @@ -160,8 +164,12 @@ + + measure_conversion.xsl: Empty string passed for unit when when converting to to 'cm' - passing unmodified value back + + - measure_conversion.xsl: Find no conversion for to 'cm'! + unrecognised value '' passed to 'convert2cm' - please update measure_conversion.xsl to handle this unit @@ -195,8 +203,12 @@ + + measure_conversion.xsl: Empty string passed for unit when when converting to to 'in' - passing unmodified value back + + - measure_conversion.xsl: Find no conversion for to 'in'! + unrecognised value '' passed to 'convert2in' - please update measure_conversion.xsl to handle this unit @@ -230,8 +242,12 @@ + + measure_conversion.xsl: Empty string passed for unit when when converting to to 'dpt' - passing unmodified value back + + - measure_conversion.xsl: Find no conversion for to 'dpt'! + unrecognised value '' passed to 'convert2dpt' - please update measure_conversion.xsl to handle this unit @@ -265,8 +281,12 @@ + + measure_conversion.xsl: Empty string passed for unit when when converting to to 'pica' - passing unmodified value back + + - measure_conversion.xsl: Find no conversion for to 'pica'! + unrecognised value '' passed to 'convert2pica' - please update measure_conversion.xsl to handle this unit @@ -300,8 +320,12 @@ + + measure_conversion.xsl: Empty string passed for unit when when converting to to 'pt' - passing unmodified value back + + - measure_conversion.xsl: Find no conversion for to 'pt'! + unrecognised value '' passed to 'convert2pt' - please update measure_conversion.xsl to handle this unit @@ -335,8 +359,12 @@
[PATCH 08/17] XHTML export: Change the non-existent "h" tag to a "div" tag
From: Andrew Sayers --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index d4d5ee7..fdc4e19 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2589,7 +2589,7 @@ - + -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 07/17] XHTML export: Use zero-width spaces instead of non-breaking spaces
From: Andrew Sayers The XHTML writer sometimes needs to force an element to have height. Using non-breaking spaces in underlined paragraphs shows an ugly underline, so we use zero-width spaces instead. --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 22 +++--- .../source/xslt/odf2xhtml/export/xhtml/table.xsl | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index fc018c4..d4d5ee7 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -391,9 +391,9 @@ --> - - + + + @@ -743,7 +743,7 @@ - + @@ -889,7 +889,7 @@ - + @@ -995,7 +995,7 @@ cm; - + @@ -2056,13 +2056,13 @@ + so we use a zero-width space instead --> - + @@ -2551,7 +2551,7 @@ - + @@ -2620,7 +2620,7 @@ - + diff --git filter/source/xslt/odf2xhtml/export/xhtml/table.xsl filter/source/xslt/odf2xhtml/export/xhtml/table.xsl index 2f72ee7..b7180ba 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/table.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/table.xsl @@ -159,7 +159,7 @@ + therefore a zero-width space has been inserted --> @@ -170,7 +170,7 @@ - + -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 16/17] XHTML export: less-ugly createTabIndent implementation
From: Andrew Sayers "createTabIndent" used to position spans absolutely, so a paragraph with nothing but indented s would be set to zero height. A document that uses tabs on adjacent paragraphs will therefore see all the text on top of each other. Padding gets much closer to the document's intent. --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 60b5808..bbf90d5 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -594,7 +594,7 @@ - position:absolute;left: + padding-left: -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 10/17] XHTML export: Don't print redundant styles
From: Andrew Sayers
---
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 6af404c..98ee59b 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -128,9 +128,11 @@
-
+
+
ODF styles with no properties
representable as CSS
-{ }
+{ }
+
--
1.8.5.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 14/17] XHTML export: avoid useless attempts to convert measures
From: Andrew Sayers --- .../odf2xhtml/export/common/styles/style_mapping_css.xsl | 11 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 16 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl index 822ba0b..79b8954 100644 --- filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl +++ filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl @@ -344,9 +344,14 @@ - - - + + 0 + + + + + + diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 51fb7b6..1126f8e 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -596,9 +596,11 @@ position:absolute;left: - - - + + + + + @@ -2000,9 +2002,11 @@ - - - + + + + + -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 06/17] XHTML export: Specify the font-family for bullet points
From: Andrew Sayers --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 10 ++ 1 file changed, 10 insertions(+) diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl index 6f3e980..fc018c4 100644 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl @@ -2023,6 +2023,16 @@ ;min-width: cm; + + + + + + font-family: + + ; + + -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 13/17] XHTML export: silence an unhelpful warning
From: Andrew Sayers
---
filter/source/xslt/odf2xhtml/export/common/body.xsl | 2 +-
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl
filter/source/xslt/odf2xhtml/export/common/body.xsl
index 5aed262..dfb49c0 100644
--- filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -431,7 +431,7 @@
- Using default element rule for ODF element
''.
+ Using default element
rule for ODF element ''.
diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 5df5cd4..51fb7b6 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1537,12 +1537,12 @@
-
+
Accessibility Warning:
No alternate text ('svg:title' element) set for
image '
'!
-
+
--
1.8.5.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 12/17] XHTML export: strip whitespace in binary data
From: Andrew Sayers Fixes output in xsltproc --- filter/source/xslt/odf2xhtml/export/common/body.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl filter/source/xslt/odf2xhtml/export/common/body.xsl index cfb464f..5aed262 100644 --- filter/source/xslt/odf2xhtml/export/common/body.xsl +++ filter/source/xslt/odf2xhtml/export/common/body.xsl @@ -360,7 +360,7 @@ - data:image/*;base64, + data:image/*;base64, -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 03/17] XHTML export: remove trailing space
From: Andrew Sayers --- .../source/xslt/odf2xhtml/export/common/body.xsl | 68 +++--- .../export/common/styles/style_mapping_css.xsl | 6 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git filter/source/xslt/odf2xhtml/export/common/body.xsl filter/source/xslt/odf2xhtml/export/common/body.xsl index 3196fac..4353c7c 100644 --- filter/source/xslt/odf2xhtml/export/common/body.xsl +++ filter/source/xslt/odf2xhtml/export/common/body.xsl @@ -151,7 +151,7 @@ - + @@ -170,13 +170,13 @@ - + - + diff --git filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl index e56be28..d42 100644 --- filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl +++ filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl @@ -87,7 +87,7 @@ - + @@ -123,7 +123,7 @@ -text-align:left ! important; +text-align:left ! important; text-align:right ! important; @@ -292,7 +292,7 @@ writing-mode: ; - + -- 1.8.5.1 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
