summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2010-11-24 19:26:45 +0000
committercorvid <corvid@lavabit.com>2010-11-24 19:26:45 +0000
commit58cb0cbc32a4e464d7f2601a872cc308bf5dd45b (patch)
treefc2519fe9164a6f4eaaa1df1f33ef08a76e174ae
parent9ca5a62164a183247bb01b63456144f453349c33 (diff)
trim some spaces
-rw-r--r--doc/README2
-rw-r--r--doc/dillo.118
-rw-r--r--doc/user_help.html8
-rw-r--r--dw/fltkplatform.cc6
-rw-r--r--dw/fltkviewbase.cc4
-rw-r--r--dw/types.cc4
-rw-r--r--src/cache.c2
-rw-r--r--src/capi.c2
-rw-r--r--src/css.hh2
-rw-r--r--src/html.cc2
-rw-r--r--src/styleengine.cc2
-rw-r--r--src/styleengine.hh2
-rw-r--r--src/table.cc2
13 files changed, 28 insertions, 28 deletions
diff --git a/doc/README b/doc/README
index 8b0a8d63..8af9a877 100644
--- a/doc/README
+++ b/doc/README
@@ -47,5 +47,5 @@ Jorge.-
* Please submit your patches with 'hg diff'.
- Happy coding!
+ Happy coding!
--Jcid
diff --git a/doc/dillo.1 b/doc/dillo.1
index 6e96cf99..2342d76a 100644
--- a/doc/dillo.1
+++ b/doc/dillo.1
@@ -61,38 +61,38 @@ User's home directory.
URL of proxy to send HTTP traffic through.
.SH FILES
.TP
-.I dpid
+.I dpid
Dillo plugin daemon
.TP
-.I dpidc
+.I dpidc
Control program for dpid.
.TP
-.I ~/.dillo/bm.txt
+.I ~/.dillo/bm.txt
User bookmarks
.TP
.I ~/.dillo/certs/
Saved certificates for HTTPS.
.TP
-.I ~/.dillo/cookies.txt
+.I ~/.dillo/cookies.txt
Stored cookies
.TP
-.I ~/.dillo/cookiesrc
+.I ~/.dillo/cookiesrc
Cookie settings
.TP
-.I ~/.dillo/dillorc
+.I ~/.dillo/dillorc
Configuration file.
.TP
.I ~/.dillo/dpid_comm_keys
Keys used in dpi daemon communication.
.TP
-.I ~/.dillo/dpidrc
+.I ~/.dillo/dpidrc
Contains name of directory containing dpis, and associates
dpi files with protocols.
.TP
-.I ~/.dillo/keysrc
+.I ~/.dillo/keysrc
Keybindings.
.TP
-.I ~/.dillo/style.css
+.I ~/.dillo/style.css
User style sheet
.SH SEE ALSO
.BR wget (1)
diff --git a/doc/user_help.html b/doc/user_help.html
index 296b0c5a..91dc748f 100644
--- a/doc/user_help.html
+++ b/doc/user_help.html
@@ -41,7 +41,7 @@
</ul>
</td></tr>
</table>
-
+
<table WIDTH="100%" BORDER=1 CELLSPACING=0 CELLPADDING=3>
<tr ALIGN=LEFT VALIGN=TOP><td bgcolor="wheat">
<h4><font color="green">Usage:</font></h4>
@@ -61,8 +61,8 @@
<li> <b>Configuration:</b> If you want to change Dillo's
appearance or behaviour, look at the options in your
<b><font color="#5040a0">dillorc</font></b>
- file (if you don't have a copy in your ~/.dillo/ directory, get it
- <a href='http://www.dillo.org/dillorc'>here</a>).
+ file (if you don't have a copy in your ~/.dillo/ directory, get it
+ <a href='http://www.dillo.org/dillorc'>here</a>).
<li> Clicking the "Reload" button always requests an end-to-end reload
of the page currently viewed, but it will *not* reload embedded
images during this process.
@@ -224,7 +224,7 @@
(<a href='http://www.dillo.org/dpi1.html'>dpi</a>) framework.
This should be transparent to the end user. Please note that:
<ul>
- <li>It is a good idea to keep a backup of your
+ <li>It is a good idea to keep a backup of your
<code>~/.dillo/bm.txt</code>
<li>The server will stay alive after closing dillo.
<li>You can stop the server by sending it a KILL signal. Dillo
diff --git a/dw/fltkplatform.cc b/dw/fltkplatform.cc
index 010aa113..17eb5d51 100644
--- a/dw/fltkplatform.cc
+++ b/dw/fltkplatform.cc
@@ -358,7 +358,7 @@ int FltkPlatform::textWidth (core::style::Font *font, const char *text,
int width = 0;
FltkFont *ff = (FltkFont*) font;
int curr = 0, next = 0, nb;
-
+
if (font->fontVariant == 1) {
int sc_fontsize = lout::misc::roundInt(ff->size * 0.78);
for (curr = 0; next < len; curr = next) {
@@ -380,10 +380,10 @@ int FltkPlatform::textWidth (core::style::Font *font, const char *text,
} else {
setfont (ff->font, ff->size);
width = (int) getwidth (text, len);
-
+
if (font->letterSpacing) {
int curr = 0, next = 0;
-
+
while (next < len) {
next = nextGlyph(text, curr);
width += font->letterSpacing;
diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc
index 373e5454..cab22cf4 100644
--- a/dw/fltkviewbase.cc
+++ b/dw/fltkviewbase.cc
@@ -422,7 +422,7 @@ void FltkViewBase::drawRectangle (core::style::Color *color,
int x2 = translateCanvasXToViewX (x + width);
int y2 = translateCanvasYToViewY (y + height);
- // We only support rectangles with line width 1px, so we clip with
+ // We only support rectangles with line width 1px, so we clip with
// a rectangle 1px wider and higher than what we actually expose.
// This is only really necessary for non-filled rectangles.
clipPoint (&x1, &y1, 1);
@@ -554,7 +554,7 @@ void FltkWidgetView::drawText (core::style::Font *font,
while (next < len) {
next = theLayout->nextGlyph(text, curr);
drawtext(text + curr, next - curr, viewX, viewY);
- viewX += font->letterSpacing +
+ viewX += font->letterSpacing +
(int)getwidth(text + curr,next - curr);
curr = next;
}
diff --git a/dw/types.cc b/dw/types.cc
index 047e7705..4d94f494 100644
--- a/dw/types.cc
+++ b/dw/types.cc
@@ -69,7 +69,7 @@ bool Rectangle::intersectsWith (Rectangle *otherRect, Rectangle *dest)
dest->x = dest->y = dest->width = dest->height = 0;
}
- return doIntersect;
+ return doIntersect;
}
/*
@@ -180,7 +180,7 @@ bool Polygon::linesCross0(int ax1, int ay1, int ax2, int ay2,
int z1 = zOfVectorProduct (ax1 - bx1, ay1 - by1, bx2 - bx1, by2 - by1);
int z2 = zOfVectorProduct (ax2 - bx1, ay2 - by1, bx2 - bx1, by2 - by1);
- return (z1 <= 0 && z2 >= 0) || (z1 >= 0 && z2 <= 0);
+ return (z1 <= 0 && z2 >= 0) || (z1 >= 0 && z2 <= 0);
}
/**
diff --git a/src/cache.c b/src/cache.c
index ec7af67d..ee9f2218 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -516,7 +516,7 @@ const char *a_Cache_set_content_type(const DilloUrl *url, const char *ctype,
((!major || !*major) && (!minor || !*minor))) {
/* META only gives charset; use detected MIME type too */
entry->TypeNorm = dStrconcat(entry->TypeDet, ctype, NULL);
- } else if (*from == 'm' &&
+ } else if (*from == 'm' &&
!dStrncasecmp(ctype, "text/xhtml", 10)) {
/* WORKAROUND: doxygen uses "text/xhtml" in META */
entry->TypeNorm = dStrdup(entry->TypeDet);
diff --git a/src/capi.c b/src/capi.c
index 16c942b9..5e2928e3 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -362,7 +362,7 @@ static void Capi_dpi_send_source(BrowserWindow *bw, DilloUrl *url)
* For a user request, the action will be permitted.
* For an automatic request, permission to load depends on the filter set
* by the user.
- */
+ */
static bool_t Capi_filters_test(const DilloUrl *wanted,
const DilloUrl *requester)
{
diff --git a/src/css.hh b/src/css.hh
index bfacb0ef..bf7d3c1d 100644
--- a/src/css.hh
+++ b/src/css.hh
@@ -462,7 +462,7 @@ class CssContext {
static CssStyleSheet *userStyle;
static CssStyleSheet *userImportantStyle;
CssStyleSheet *sheet[CSS_PRIMARY_USER_IMPORTANT + 1];
- int pos;
+ int pos;
void buildUserAgentStyle ();
void buildUserStyle ();
diff --git a/src/html.cc b/src/html.cc
index 11ad98e3..5b7f4988 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -1760,7 +1760,7 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize)
bgColor = html->styleEngine->backgroundColor ();
if (bgColor)
- HT2LT(html)->setBgColor(bgColor);
+ HT2LT(html)->setBgColor(bgColor);
/* Determine a color for visited links.
* This color is computed once per page and used for immediate feedback
diff --git a/src/styleengine.cc b/src/styleengine.cc
index 9a28f562..7a297925 100644
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@@ -743,7 +743,7 @@ Style * StyleEngine::wordStyle0 () {
/**
* \brief Recompute all style information from scratch
- * This is used to take into account CSS styles for the HTML-element.
+ * This is used to take into account CSS styles for the HTML-element.
* The CSS data is only completely available after parsing the HEAD-section
* and thereby after the HTML-element has been opened.
* Note that restyle() does not change any styles in the widget tree.
diff --git a/src/styleengine.hh b/src/styleengine.hh
index 841d5c06..e37aeed1 100644
--- a/src/styleengine.hh
+++ b/src/styleengine.hh
@@ -43,7 +43,7 @@ class StyleEngine {
if (!n->nonCssProperties)
n->nonCssProperties = new CssPropertyList (true);
- n->nonCssProperties->set(name, type, value);
+ n->nonCssProperties->set(name, type, value);
}
void preprocessAttrs (dw::core::style::StyleAttrs *attrs);
void postprocessAttrs (dw::core::style::StyleAttrs *attrs);
diff --git a/src/table.cc b/src/table.cc
index d21f8d74..58cdf22e 100644
--- a/src/table.cc
+++ b/src/table.cc
@@ -219,7 +219,7 @@ void Html_tag_open_th(DilloHtml *html, const char *tag, int tagsize)
/*
* The table border model is stored in the table's stack item
- */
+ */
static int Html_table_get_border_model(DilloHtml *html)
{
static int i_TABLE = -1;