source/text/shared/00/00000020.xhp | 6 +++---
source/text/shared/optionen/01030500.xhp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 29a6bcaa15745f3707a03b1a34ae1e89ded92749
Author: Stanislav Horacek <stanislav.hora...@gmail.com>
Date: Sat Dec 7 18:16:06 2013 +0100
fdo#72340 replace Netscape by Firefox in HTML compatibility options
Change-Id: Id17fe4a769f03722428b7d070c93c9a12e6ce215
Reviewed-on: https://gerrit.libreoffice.org/6969
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/source/text/shared/00/00000020.xhp
b/source/text/shared/00/00000020.xhp
index 517966b..8503675 100644
--- a/source/text/shared/00/00000020.xhp
+++ b/source/text/shared/00/00000020.xhp
@@ -75,8 +75,8 @@
<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U"
oldref="199">Comments are used to include unknown characters in an HTML
document. Every note that begins with "HTML:..." and ends with ">" is
treated as an HTML code, but is exported without these designations. Several
tags around text can be included after "HTML:..." Accented characters are
converted into the ANSI character set. Comments are created during import (for
example, for meta tags that have no room in the file properties or unknown
tags).</paragraph>
<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U"
oldref="201">The HTML import of $[officename] Writer is able to read files that
have UTF-8 or UCS2 character coding. All characters that are contained in the
ANSI character set or in the system's character set can be
displayed.</paragraph>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U"
oldref="240">When exporting to HTML, the character set selected in
<emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME -
Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>
is used. Characters not present there are written in a substitute form, which
is displayed correctly in modern web browsers. When exporting such characters,
you will receive an appropriate warning.</paragraph>
-<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG"
oldref="197">If, in <emph><switchinline select="sys"><caseinline
select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>,
you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as
the export option, upon export all important font attributes are exported as
direct attributes (for example, text color, font size, bold, italic, and so on)
in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link>
stands for Cascading Style Sheets.) Importing is also carried out according to
this standard.</paragraph>
-<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U"
oldref="130">The "font" property corresponds to Netscape Navigator; that is,
before the font size you can specify optional values for "font-style" (italic,
none), "font-variant" (normal, small-caps) and "font-weight" (normal,
bold).</paragraph>
+<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG"
oldref="197">If, in <emph><switchinline select="sys"><caseinline
select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>,
you select Mozilla Firefox, MS Internet Explorer, or $[officename] Writer as
the export option, upon export all important font attributes are exported as
direct attributes (for example, text color, font size, bold, italic, and so on)
in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link>
stands for Cascading Style Sheets.) Importing is also carried out according to
this standard.</paragraph>
+<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U"
oldref="130">The "font" property corresponds to Mozilla Firefox; that is,
before the font size you can specify optional values for "font-style" (italic,
none), "font-variant" (normal, small-caps) and "font-weight" (normal,
bold).</paragraph>
<list type="unordered">
<listitem>
<paragraph role="listitem" id="par_id3153760" xml-lang="en-US" l10n="U"
oldref="131">For example, "Font: bold italic small-caps 12pt/200% Arial,
Helvetica" switches to bold, italic, small caps, double-space with the font
family Arial or Helvetica, if Arial doesn't exist.</paragraph>
@@ -89,7 +89,7 @@
</list>
<paragraph role="paragraph" id="par_id3155135" xml-lang="en-US" l10n="CHG"
oldref="14">If MS Internet Explorer or $[officename] Writer are set as the
export option, the sizes of the control field and their internal margins are
exported as styles (print formats). CSS1 size properties are based on "width"
and "height" values. The "Margin" property is used to set equal margins on all
sides of the page. To allow different margins, the "Margin-Left",
"Margin-Right", "Margin-Top" and "Margin-Bottom" properties are
used.</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="CHG"
oldref="15">The distances of graphics and Plug-Ins to the content can be set
individually for export to $[officename] Writer and MS Internet Explorer. If
the top/bottom or right/left margin is set differently, the distances are
exported in a "STYLE" option for the corresponding tag as CSS1 size properties
"Margin-Top", "Margin-Bottom", "Margin-Left" and "Margin-Right".</paragraph>
-<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG"
oldref="16">Text frames are supported with the use of CSS1 extensions for
absolute positioned objects. This applies only to the export options Netscape
Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be
aligned as graphics, <switchinline select="sys"><caseinline select="WIN">
Plug-Ins,
+<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG"
oldref="16">Text frames are supported with the use of CSS1 extensions for
absolute positioned objects. This applies only to the export options Mozilla
Firefox, MS Internet Explorer, and $[officename] Writer. Text frames can be
aligned as graphics, <switchinline select="sys"><caseinline select="WIN">
Plug-Ins,
</caseinline></switchinline>and Floating Frames, but character-linked frames
are not possible.</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U"
oldref="46">Text frames are exported as "<SPAN>" or "<DIV>" tags if
they do not contain columns. If they do contain columns then they are exported
as "<MULTICOL>".</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U"
oldref="202">The measurement unit set in $[officename] is used for HTML export
of CSS1 properties. The unit can be set separately for text and HTML documents
under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME -
Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>
or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME -
Preferences</caseinline><defaultinline>Tools -
Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - View</emph>.
The number of exported decimal places depends on the unit.</paragraph>
diff --git a/source/text/shared/optionen/01030500.xhp
b/source/text/shared/optionen/01030500.xhp
index ba97371..d655fe8 100644
--- a/source/text/shared/optionen/01030500.xhp
+++ b/source/text/shared/optionen/01030500.xhp
@@ -72,7 +72,7 @@
<paragraph role="paragraph" id="par_id3150420" xml-lang="en-US" l10n="CHG"
oldref="46"><ahelp hid="cui/ui/opthtmlpage/starbasicwarning">If this field is
marked, when exporting to HTML a warning is shown that %PRODUCTNAME Basic
macros will be lost.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/opthtmlpage/printextension"
id="bm_id2938932" localize="false"/>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="3"
l10n="U" oldref="28">Print layout</paragraph>
-<paragraph role="paragraph" id="par_id3145254" xml-lang="en-US" l10n="CHG"
oldref="39"><ahelp hid=".">If you mark this field, the print layout of the
current document is exported as well.</ahelp> It can be read by $[officename],
Netscape Navigator, and MS Internet Explorer.</paragraph>
+<paragraph role="paragraph" id="par_id3145254" xml-lang="en-US" l10n="CHG"
oldref="39"><ahelp hid=".">If you mark this field, the print layout of the
current document is exported as well.</ahelp> It can be read by $[officename],
Mozilla Firefox, and MS Internet Explorer.</paragraph>
<paragraph role="note" id="par_id3156276" xml-lang="en-US" l10n="U"
oldref="41">The HTML filter supports CSS2 (Cascading Style Sheets Level 2) for
printing documents. These capabilities are only effective if print layout
export is activated.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/opthtmlpage/savegrflocal"
id="bm_id8177434" localize="false"/>
<paragraph role="heading" id="hd_id3144764" xml-lang="en-US" level="3"
l10n="U" oldref="24">Copy local graphics to Internet</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
