Merge branch 'RefactorPrint'

- Modifies printing model to be similar to glabels-3.x.
   - Allow simple projects to print by-the-page (#51)
   - Added collated vs uncollated document merges
- Added ability to separate merge groups by page
- Updated man pages
- Updated misc developer documentation

user-docs/_build/man/glabels-batch-qt.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "GLABELS-BATCH-QT" "1" "Nov 27, 2019" "" "gLabels"
+.TH "GLABELS-BATCH-QT" "1" "Jan 01, 2020" "" "gLabels"
 .SH NAME
 glabels-batch-qt \- batch creation of labels and business cards
 .
@@ -35,9 +35,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBglabels\-batch\-qt\fP [\fIoptions\fP] [\fIfilename\fP]
 .SH DESCRIPTION
 .sp
-\fBglabels\-batch\-qt\fP is a utility for printing files previously
-prepared with \fBglabels\-qt\fP from the command line.  It is suitable
-for use with scripts.
+\fBglabels\-batch\-qt\fP is a utility for printing a glabels project file
+from the command line.  It is suitable for use with scripts.
 .SH OPTIONS
 .INDENT 0.0
 .TP
@@ -57,13 +56,15 @@ Send output to <printer>.
 .INDENT 0.0
 .TP
 .B \-o [<filename>], \-\-output [<filename>]
-Set output filename to <filename>. Set to "\-" for stdout.
-(Default="output.pdf")
+.TP
+.B Set output filename to <filename>. If filename is "\-", write to standard output.
+.TP
+.B (Default="output.pdf")
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-s <n>, \-\-sheets <n>
-Set number of sheets to <n>. (Default=1)
+For simple projects, sets number of full sheets to <n>. (Default=1)
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -72,8 +73,18 @@ Set number of copies to <n>. (Default=1)
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-a, \-\-collate
+Collate merge copies.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-g, \-\-group
+Start each merge group on a new page.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-f <n>, \-\-first <n>
-Set starting label on 1st page to <n>. (Default=1)
+Set starting position to <n>. (Default=1)
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -113,7 +124,20 @@ templates here!\fP
 .B ${HOME}/.glabels/
 Directory for manually created product templates.
 .UNINDENT
-.SH BUGS
+.SH KNOWN ISSUES
+.sp
+On GNU/Linux platforms, \fBglabels\-batch\-qt\fP must be run from within a windowing environment, such as X or Wayland.  This is because Qt requires a suitable platform to obtain system font information.  A work\-around is to run \fBglabels\-batch\-qt\fP using a virtual X server environment:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+xvfb\-run glabels\-batch\-qt \-o output.pdf myProject.glabels
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.SH REPORTING BUGS
 .sp
 On GNU/Linux platforms, \fBglabels\-batch\-qt\fP must be run from within a windowing environment, such as X or Wayland.  This is because Qt requires a suitable platform to obtain system font information.  A work\-around is to run \fBglabels\-batch\-qt\fP using a virtual X server environment:
 .INDENT 0.0
@@ -134,9 +158,7 @@ Bugs and feature requests can be reported via the gLabels issue tracking system
 \fBglabels\-qt(1)\fP
 .sp
 The gLabels homepage at <\fI\%http://glabels.org/\fP>.
-.SH AUTHOR
-Jim Evins
 .SH COPYRIGHT
-2018, Jim Evins <evins@snaught.com>
+2020, Jim Evins <evins@snaught.com>
 .\" Generated by docutils manpage writer.
 .

user-docs/_build/man/glabels-qt.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "GLABELS-QT" "1" "Nov 27, 2019" "" "gLabels"
+.TH "GLABELS-QT" "1" "Jan 01, 2020" "" "gLabels"
 .SH NAME
 glabels-qt \- create labels and business cards
 .
@@ -75,9 +75,7 @@ Bugs and feature requests can be reported via the gLabels issue tracking system
 \fBglabels\-batch\-qt(1)\fP
 .sp
 The gLabels homepage at <\fI\%http://glabels.org/\fP>.
-.SH AUTHOR
-Jim Evins
 .SH COPYRIGHT
-2018, Jim Evins <evins@snaught.com>
+2020, Jim Evins <evins@snaught.com>
 .\" Generated by docutils manpage writer.
 .