[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 07/10: [grohtml]: Fix misspelled variable.
From: |
G. Branden Robinson |
Subject: |
[groff] 07/10: [grohtml]: Fix misspelled variable. |
Date: |
Mon, 26 Jul 2021 20:38:49 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit c8f6196a72bcbe2ba0e706a35626403bd1461752
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Jul 26 23:45:34 2021 +1000
[grohtml]: Fix misspelled variable.
* src/preproc/html/pre-html.cpp: Rename `IMAGE_BOARDER_PIXELS` to
`IMAGE_BORDER_PIXELS`.
Also reflow license notice at 72 columns.
---
ChangeLog | 7 +++++++
src/preproc/html/pre-html.cpp | 29 +++++++++++++++--------------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1317073..627a33a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2021-07-26 G. Branden Robinson <g.branden.robinson@gmail.com>
+ [grohtml]: Fix misspelled variable.
+
+ * src/preproc/html/pre-html.cpp: Rename `IMAGE_BOARDER_PIXELS`
+ to `IMAGE_BORDER_PIXELS`.
+
+2021-07-26 G. Branden Robinson <g.branden.robinson@gmail.com>
+
[libgroff, troff]: Add debug diagnostic level.
* src/include/error.h: Declare functions
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 90fb517..84e5a32 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -3,19 +3,20 @@
*
* This file is part of groff.
*
- * groff is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * groff is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
*
- * groff is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * groff is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with groff; see the file COPYING. If not, write to the Free Software
- * Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with groff; see the file COPYING. If not, write to the Free
+ * Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#define PREHTMLC
@@ -148,7 +149,7 @@ extern "C" const char *Version_string;
#define DEFAULT_LINE_LENGTH 7 // inches wide
#define DEFAULT_IMAGE_RES 100 // number of pixels per inch resolution
-#define IMAGE_BOARDER_PIXELS 0
+#define IMAGE_BORDER_PIXELS 0
#define INLINE_LEADER_CHAR '\\'
// Don't use colour names here! Otherwise there is a dependency on
@@ -1007,17 +1008,17 @@ void imageList::createImage(imageItem *i)
if (i->X1 != -1) {
char *s;
int x1 = max(min(i->X1, i->X2) * image_res / postscriptRes
- - IMAGE_BOARDER_PIXELS,
+ - IMAGE_BORDER_PIXELS,
0);
int y1 = max(image_res * vertical_offset / 72
+ min(i->Y1, i->Y2) * image_res / postscriptRes
- - IMAGE_BOARDER_PIXELS,
+ - IMAGE_BORDER_PIXELS,
0);
int x2 = max(i->X1, i->X2) * image_res / postscriptRes
- + IMAGE_BOARDER_PIXELS;
+ + IMAGE_BORDER_PIXELS;
int y2 = image_res * vertical_offset / 72
+ max(i->Y1, i->Y2) * image_res / postscriptRes
- + 1 + IMAGE_BOARDER_PIXELS;
+ + 1 + IMAGE_BORDER_PIXELS;
if (createPage(i->pageNo) == 0) {
s = make_message("pnmcut%s %d %d %d %d < %s "
"| pnmcrop -quiet | pnmtopng%s %s > %s\n",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 07/10: [grohtml]: Fix misspelled variable.,
G. Branden Robinson <=