r16818 by jghali - #10242: some corrections in the docs
scribus-commit
scribus-commit at lists.scribus.net
Tue Sep 6 10:38:12 UTC 2011
Author: jghali
Date: Tue Sep 6 10:38:12 2011
New Revision: 16818
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16818
Log:
#10242: some corrections in the docs
Modified:
trunk/Scribus/doc/en/WwFrames.html
trunk/Scribus/doc/en/WwImages.html
trunk/Scribus/doc/en/WwRenderframes.html
trunk/Scribus/doc/en/WwShapes.html
trunk/Scribus/doc/en/WwText.html
trunk/Scribus/doc/en/images/rf2.png
Modified: trunk/Scribus/doc/en/WwFrames.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16818&path=/trunk/Scribus/doc/en/WwFrames.html
==============================================================================
--- trunk/Scribus/doc/en/WwFrames.html (original)
+++ trunk/Scribus/doc/en/WwFrames.html Tue Sep 6 10:38:12 2011
@@ -238,7 +238,7 @@
default background or fill color of text and image frames is also None.
<br>
<br>
-For Shapes and Polygons, the default fill color is set to None, wheras the default line color is Black. For all
+For Shapes and Polygons, the default fill color is set to None, whereas the default line color is Black. For all
kinds of frames these default colors can be set in <span style="font-style: italic;">File > Document Setup > Tools</span> for the current document and in <span style="font-style: italic;">File >
Preferences > Tools</span> for new documents.
<h3>Text Flow Around Frame</h3>
@@ -255,9 +255,9 @@
the <span style="font-style: italic;">Shape</span> tab of Properties. For text and image frames, all 3 coincide
with each other when they are created. <br>
</p>
- <p>As for shapes and polygons, only only the frame and
+ <p>As for shapes and polygons, only the frame and
contour lines coincide (i.e., they are identical with the shape/polygon
-itself), whereas the boundling box is always the surrounding rectangle.
+itself), whereas the bounding box is always the surrounding rectangle.
Details will be found elsewhere, but in the
<span style="font-style: italic;">Shape</span> tab of the Properties Palette you can edit the frame/shape or the contour line
independently. </p>
@@ -272,4 +272,4 @@
</tbody>
</table>
-</body></html>
+</body></html>
Modified: trunk/Scribus/doc/en/WwImages.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16818&path=/trunk/Scribus/doc/en/WwImages.html
==============================================================================
--- trunk/Scribus/doc/en/WwImages.html (original)
+++ trunk/Scribus/doc/en/WwImages.html Tue Sep 6 10:38:12 2011
@@ -46,12 +46,12 @@
</table>
<h3>Properties: Image</h3>
<table cellpadding=3><tr>
-<td>When an Image is first loaded, the default is for it to have Free Scaling, and will be imported at its "native" size, at 72 DPI (your monitor's resolution).
+<td>When an Image is first loaded, the default is for it to have Free Scaling or as is set in <i>File > Preferences > Tools > Image</i>.
<p>Under Free Scaling the spinboxes are:
<ul>
<li><b>X-Pos</b> and <b>Y-Pos</b> - Relative position of the left upper corner of the image to the left upper corner of the frame.</li>
-<li><b>X-Scale</b> and <b>Y-Scale</b> - Magnification of the image, compared to when it is at 72 DPI.</li>
+<li><b>X-Scale</b> and <b>Y-Scale</b> - Magnification of the image, compared to its native DPI.</li>
<li><b>Actual X-DPI</b> and <b>Actual Y-DPI</b> - These of course are inversely related to magnification. Your monitor will still likely be showing the image at no better than 72 PPI, but this refers to the final resolution to be exported to the PDF.</li>
</ul>
<p>In many cases, we may have a more or less set frame size we wish to squeeze an entire image into, in which case choosing <b>Scale to Frame Size</b> (or <b>Adjust Image to Frame</b> from the Context menu) makes sense. Without checking <b>Proportional</b>, the image is simply stretched to fit the frame and may be quite distorted. You should find the combination of scaling to frame size (proportional) and then <b>Adjust Frame to Image</b> from the Context menu very useful for making a frame exactly the right size for your image.
Modified: trunk/Scribus/doc/en/WwRenderframes.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16818&path=/trunk/Scribus/doc/en/WwRenderframes.html
==============================================================================
--- trunk/Scribus/doc/en/WwRenderframes.html (original)
+++ trunk/Scribus/doc/en/WwRenderframes.html Tue Sep 6 10:38:12 2011
@@ -191,7 +191,7 @@
<h1>Configuration</h1>
<p>To make Render Frames work, you need to have the required programs
installed on your computer. By default, Scribus supports five
-programs, namely LaTeX, Lilypond, gnuplot, dot/Graphviz and Lilypond. On Linux,
+programs, namely LaTeX, Lilypond, gnuplot, dot/Graphviz and POV-Ray. On Linux,
your package manager will take care about the installation and the
dependencies of the software. On other platforms you might need to
install the programs separately and edit some configuration files.</p>
@@ -205,7 +205,7 @@
<p><code><editorsettings description="Gnuplot" icon="gnuplot.png"></code> This line sets the description of the program, as well as the icon for the drop-down list in the Render Frame Editor. It must be stored in the same directory as the XML file. You can use PNG, XPM and SVG icons.</p>
<p><code><executable command="gnuplot"></code> This is the command-line call of the program. You can only use software that can work on the command-line. Also, the program needs to be able to create output in either PNG, PDF or EPS format. By default, Scribus uses the command-line options for Linux/UNIX systems.</p>
<p><code><imagefile extension=".png"/></code> Here you tell the editor which file format it has to expect from the external program.</p>
-<p><code><highlighter> </highlighter></code> This part is mainly interesting for programmers, as it allows for the creation of indvidual syntax highlighting schemes by using Regular Expressions. For further information see: <a href="http://docs.kde.org/kde3/en/kdeutils/KRegExpEditor/index.html">http://docs.kde.org/kde3/en/kdeutils/KRegExpEditor/index.html</a> and <a href="http://doc.trolltech.com/4.4/qregexp.html">http://doc.trolltech.com/4.4/qregexp.html</a>.</p>
+<p><code><highlighter> </highlighter></code> This part is mainly interesting for programmers, as it allows for the creation of indvidual syntax highlighting schemes by using Regular Expressions.</p>
<p><code><empty-frame-text></code> Here you can enter sample text in the
markup language of the program you want to use, for instance:</p>
<p><code>plot sin(x), (cos(x))**2</code></p>
@@ -242,7 +242,7 @@
you save your markup from the external editor, Scribus "intercepts"
the data and renders the output into the frame or will display error messages in the "Program Messages" field. The interception also
means that any change to the markup text won't be saved anywhere but
-in your Scribus file. If you haven't specified an external editor in <i>Preferences < Tools</i>, Scribus will display an error message:</p>
+in your Scribus file. If you haven't specified an external editor in <i>Preferences > External Tools</i>, Scribus will display an error message:</p>
<br></br>
<table width="100%"><tr><td align="center"><img src="images/rf-error3.png"/></td></tr></table>
<br></br>
Modified: trunk/Scribus/doc/en/WwShapes.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16818&path=/trunk/Scribus/doc/en/WwShapes.html
==============================================================================
--- trunk/Scribus/doc/en/WwShapes.html (original)
+++ trunk/Scribus/doc/en/WwShapes.html Tue Sep 6 10:38:12 2011
@@ -12,7 +12,7 @@
<h3>Shapes</h3>
<table cellpadding=5><tr>
<td>Shapes are a collection of predetermined shapes, and with version 1.3.5+ have been greatly increased in number. The default shape when you start Scribus is the simple rectangular shape which the icon shows. Just to the right side of the shape figure on the toolbar is an arrow for a drop down list of subselections. Once you select from a drop down category and specific type (click with the mouse), you see the toolbar icon change to your selected shape. <i>Note: the appearance of the Shapes icons has been enhanced in the image to the right – they will not appear as distinct as this.</i>
-<p>As stated in Working with Frames, the default line and fill color for shapes and polygons is black. You can change that for the current documents in <i>File > Document Setup > Tools > Shape (icon)</i>, and for future documents in <i>File > Preferences > Tools > Shape (icon)</i>.
+<p>As stated in Working with Frames, the default line and fill color for shapes and polygons is None. You can change that for the current documents in <i>File > Document Setup > Tools > Shape (icon)</i>, and for future documents in <i>File > Preferences > Tools > Shape (icon)</i>.
<p>Just like other frames, you simply click-drag from one corner of the shape to its opposite. If you hold down Shift while click-dragging, when you let up on the mouse the shape will fill to the margins of your page.</td><td>
<img src="images/shapes8.png" ALT="Shapes Drop-down lists" ALIGN=right></td>
</tr>
Modified: trunk/Scribus/doc/en/WwText.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16818&path=/trunk/Scribus/doc/en/WwText.html
==============================================================================
--- trunk/Scribus/doc/en/WwText.html (original)
+++ trunk/Scribus/doc/en/WwText.html Tue Sep 6 10:38:12 2011
@@ -15,7 +15,7 @@
<li>You can also set up custom tags in text files to act as a filter for formatting on import.</li>
</ul>
<h3>Using Story Editor</h3>
-This is listed first because it is the recommended way to enter text manually from the keyboard. Bring up the Story Editor (SE) from the Context menu or with Ctrl+T. Because SE is very versatile, it will be covered in detail in its own section. Its main disadvantage is that you will not see the final appearance of the text until you update the frame, with or without exiting SE. SE is also a convenient way to create, edit, and apply Paragraph and Character Styles.
+This is listed first because it is the recommended way to enter text manually from the keyboard. Bring up the Story Editor (SE) from the Context menu or with Ctrl+T. Because SE is very versatile, it will be covered in detail in its own section. Its main disadvantage is that you will not see the final appearance of the text until you update the frame, with or without exiting SE. SE is also a convenient way to apply Paragraph and Character Styles.
<h3>On the Main Screen</h3>
A selected frame can enter Edit Contents mode by clicking the Edit Contents icon on the toolbar or double-clicking on the frame (keyboard: E). The advantage of this is that you can see immediately the appearance of your additions or edits. It is a bit slower, since screen refreshes are involved. You can use Properties to change the font, style, and other characteristics such as linespacing. For small edits and frames which only contain a small amount of text, Edit Contents can serve your needs well.
<h3>Inline Graphics</h3>
@@ -51,7 +51,7 @@
<td>Right-click on a frame to show its context menu, seen to the right. We will not cover all the features of the text frame context menu, but here is the particular list of choices available for text frames.
<ul>
<li>At the top, <b>Info</b> gives information about the content of the frame, statistics on number of paragraphs, lines, and so forth, and also whether this frame is set to print, which also applies to whether it will be included in PDF export.</li>
-<li><b>Undo</b> will undo the last operation on the frame, but it's important to mention that this does not include text editing, which is currently not Undo-able. <b>Redo</b> is available when some operation has been undone.</li>
+<li><b>Undo</b> will undo the last operation on the frame. <b>Redo</b> is available when some operation has been undone.</li>
<li><b>Get Text</b> and <b>Append Text</b> allow for importation of text data from a file.</li>
<li><b>Edit Text</b> brings up the Story Editor</b>
<li><b>Sample Text</b> allows for importing so-called <i>Lorem ipsum</i> text, not only in the original Latin, but also many other languages. A dialog comes up for choice of the language and amount of sample text to create.</li>
@@ -111,7 +111,7 @@
<ol>
<li>Underline sections of text, including intervening spaces. Hold down the button to make adjustments of <b>Displacement</b> and <b>Linewidth</b>. Defaults are in <i>File > Preferences > Typography</i>.</li>
<li>Underline words only, not intervening spaces. Hold down the button to make adjustments of <b>Displacement</b> and <b>Linewidth</b>. Defaults are in <i>File > Preferences > Typography</i>.</li>
-<li>Subscript. Relative size (<<b>Scaling</b>) and <b>Displacement</b> are set in <i>File > Preferences > Typography</i>.</li>
+<li>Subscript. Relative size (<b>Scaling</b>) and <b>Displacement</b> are set in <i>File > Preferences > Typography</i>.</li>
<li>Superscript. Defaults are in <i>File > Preferences > Typography</i>.</li>
<li>All caps.</li>
<li>Small caps. There are a few fonts that have a real small caps subset, but this is a workaround for those that do not.</li>
Modified: trunk/Scribus/doc/en/images/rf2.png
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16818&path=/trunk/Scribus/doc/en/images/rf2.png
==============================================================================
Binary files - no diff available.
More information about the scribus-commit
mailing list