File paps-header_features.patch of Package paps
---
src/paps.1 | 12 ++++++++++++
src/paps.cc | 28 +++++++++++++++++++++-------
2 files changed, 33 insertions(+), 7 deletions(-)
--- a/src/paps.1
+++ b/src/paps.1
@@ -300,6 +300,18 @@ Sets the formatting for the center of th
Use \fItext\fR as the title string for page header. By default the input
filename or "stdin" is used.
.TP
+.B \-\-header\-font=desc
+Set the header font description. Default is Monospace Bold 12.
+.TP
+.B \-\-header\-date\-format=fmt
+Set the header date format. Default is %c (see
+.BR strftime (3)).
+.TP
+.B \-\-header\-rule\-thickness=val
+Set the thickness of the header separation rule. Default is 0 (i.e. as thin as possible).
+Note that this depends on
+.BR \-\-separation\-lines .
+.TP
.B \-\-markup
Interpret input as pango markup. Pango Text Attribute Markup Language allows
marking parts of the text with tags defining additional attributes such as font
--- a/src/paps.cc
+++ b/src/paps.cc
@@ -71,6 +71,8 @@ using namespace fmt;
#define DEFAULT_FONT_SIZE "12"
#define HEADER_FONT_FAMILY "Monospace Bold"
#define HEADER_FONT_SCALE "12"
+#define HEADER_DATE_FORMAT "%c"
+#define HEADER_RULE_THICKNESS 0.1
#define MAKE_FONT_NAME(f,s) f " " s
/*
@@ -155,6 +157,8 @@ struct PageLayout {
char* footer_center = nullptr;
char* footer_right = nullptr;
string header_font_desc;
+ string header_date_format;
+ gdouble header_rule_thickness;
gdouble lpi;
gdouble cpi;
dict_t document_info;
@@ -234,7 +238,7 @@ copy_pango_parse_enum (GType type,
char **possible_values);
static char* get_encoding(void);
-string get_date();
+string get_date(PageLayout *page_layout);
string fn_basename(const string& filename);
FILE *output_fh;
@@ -581,6 +585,9 @@ int main(int argc, char *argv[])
int gutter_width = 40;
gboolean do_fatal_warnings = false;
const gchar *font = MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE);
+ const gchar *header_font_desc = MAKE_FONT_NAME (HEADER_FONT_FAMILY, HEADER_FONT_SCALE);
+ const gchar *header_date_format = HEADER_DATE_FORMAT;
+ gdouble header_rule_thickness = HEADER_RULE_THICKNESS;
gchar *encoding = nullptr;
gchar *output = nullptr;
gchar *htitle = nullptr;
@@ -597,6 +604,12 @@ int main(int argc, char *argv[])
N_("Landscape output. (Default: portrait)"), nullptr},
{"columns", 0, 0, G_OPTION_ARG_INT, &num_columns,
N_("Number of columns output. (Default: 1)"), "NUM"},
+ {"header-font", 0, 0, G_OPTION_ARG_STRING, &header_font_desc,
+ N_("Set the header font description. (Default: Monospace Bold 12)"), "DESC"},
+ {"header-date-format", 0, 0, G_OPTION_ARG_STRING, &header_date_format,
+ N_("Set the header date format. (Default: %%c)"), "DESC"},
+ {"header-rule-thickness", 0, 0, G_OPTION_ARG_DOUBLE, &header_rule_thickness,
+ N_("Set the thickness of the header separation rule. (Default: 0 (i.e. as thin as possible))"), "DESC"},
{"font", 0, 0, G_OPTION_ARG_STRING, &font,
N_("Set font. (Default: Monospace 12)"), "DESC"},
{"output", 'o', 0, G_OPTION_ARG_STRING, &output,
@@ -686,7 +699,6 @@ int main(int argc, char *argv[])
double page_height = paper_sizes[0].height;
int do_tumble = -1; /* -1 means not initialized */
int do_duplex = -1;
- const gchar *header_font_desc = MAKE_FONT_NAME (HEADER_FONT_FAMILY, HEADER_FONT_SCALE);
const gchar *filename_in;
gchar *text;
/* int header_sep = 20; */
@@ -908,6 +920,8 @@ int main(int argc, char *argv[])
else
page_layout.title = fn_basename(filename_in);
page_layout.header_font_desc = header_font_desc;
+ page_layout.header_date_format = header_date_format;
+ page_layout.header_rule_thickness = header_rule_thickness;
/* calculate x-coordinate scale */
if (page_layout.cpi > 0.0L)
@@ -1641,7 +1655,7 @@ draw_line_to_page(cairo_t *cr,
* Provide date string from current locale converted to UTF-8.
*/
string
-get_date()
+get_date(PageLayout *page_layout)
{
time_t t = time(nullptr);
GIConv cvh = nullptr;
@@ -1653,7 +1667,7 @@ get_date()
if (date_utf8 == nullptr) {
char date[256];
t = time(nullptr);
- strftime(date, sizeof(date), "%c", localtime(&t));
+ strftime(date, sizeof(date), page_layout->header_date_format.c_str(), localtime(&t));
cvh = g_iconv_open("UTF-8", get_encoding());
if (cvh == (GIConv)-1) {
@@ -1715,7 +1729,7 @@ draw_page_header_line_to_page(cairo_t
"<span font_desc=\"{}\">{}</span>\n"
"<span font_desc=\"{}\">{}</span>",
page_layout->header_font_desc,
- get_date().c_str(),
+ get_date(page_layout).c_str(),
page_layout->header_font_desc,
page_layout->title.c_str(),
page_layout->header_font_desc,
@@ -1739,7 +1753,7 @@ draw_page_header_line_to_page(cairo_t
if (page_layout->header_left)
header_parts[0]=page_layout->header_left;
else
- header_parts[0]=get_date();
+ header_parts[0]=get_date(page_layout);
if (page_layout->header_center)
header_parts[1] = page_layout->header_center;
@@ -1824,7 +1838,7 @@ draw_page_header_line_to_page(cairo_t
line_pos += logical_rect.height/2.0/PANGO_SCALE;
cairo_move_to(cr, page_layout->left_margin, line_pos);
cairo_line_to(cr,page_layout->page_width - page_layout->right_margin, line_pos);
- cairo_set_line_width(cr,0.1); // TBD
+ cairo_set_line_width(cr, page_layout->header_rule_thickness); // TBD
cairo_stroke(cr);
}
