* demo/xml2doc/image_crop.cc: Cleanup temporary files. * demo/xml2doc/templates/pdf/line.xsl: Use paragraph information. Take color into account. * demo/xml2doc/templates/pdf/regions.xsl: Fix image localization. --- scribo/ChangeLog | 11 + scribo/demo/xml2doc/image_crop.cc | 6 +- scribo/demo/xml2doc/templates/pdf/line.xsl | 390 +++++++++++++------------ scribo/demo/xml2doc/templates/pdf/regions.xsl | 14 +- 4 files changed, 215 insertions(+), 206 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e30b230..d3a1780 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2011-05-06 Guillaume Lazzara <lazzara@fidji.lrde.epita.fr> + + Improve PDF output. + + * demo/xml2doc/image_crop.cc: Cleanup temporary files. + + * demo/xml2doc/templates/pdf/line.xsl: Use paragraph + information. Take color into account. + + * demo/xml2doc/templates/pdf/regions.xsl: Fix image localization. + 2011-05-05 Guillaume Lazzara <lazzara@fidji.lrde.epita.fr> Add hexadecimal color conversion routines. diff --git a/scribo/demo/xml2doc/image_crop.cc b/scribo/demo/xml2doc/image_crop.cc index 72fd2b4..4221ee7 100644 --- a/scribo/demo/xml2doc/image_crop.cc +++ b/scribo/demo/xml2doc/image_crop.cc @@ -40,11 +40,15 @@ ImageCrop::ImageCrop(const QString& xml, const QString& img, image_(img), output_dir_(output) { - mln::io::magick::load(ima_, image_.toStdString()); + if (!image_.isEmpty()) + mln::io::magick::load(ima_, image_.toStdString()); } ImageCrop::~ImageCrop() { + // Cleanup temporary files. + foreach (QString value, region_map_) + QFile::remove(value); } diff --git a/scribo/demo/xml2doc/templates/pdf/line.xsl b/scribo/demo/xml2doc/templates/pdf/line.xsl index 7056da0..4dda6c6 100644 --- a/scribo/demo/xml2doc/templates/pdf/line.xsl +++ b/scribo/demo/xml2doc/templates/pdf/line.xsl @@ -3,201 +3,205 @@ <!-- FILE: line.xsl DESCRIPTION: match all pcGts/page/text_region/line in order to display the "text" attributes - --> - - <xsl:template match="pcGts/page/text_region/line"> - - <!-- x_height --> - <xsl:variable name="x_height"> - <xsl:value-of select="@x_height" /> - </xsl:variable> - - <!-- a_height --> - <xsl:variable name="a_height"> - <xsl:value-of select="@a_height" /> - </xsl:variable> - - - <!-- ABS(d_height) --> - <xsl:variable name="d_height_abs"> - <xsl:choose> - <xsl:when test="@d_height < 0"> - <xsl:value-of select="-@d_height" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@d_height" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <!-- a_height computed, i.e> - if (A - X < |D|) - A = X + |D| + --> + + <xsl:template match="pcGts/page/text_region"> + + <!-- WTF !?, Necessary to do a lower-case ! + FIXME: take a look at text-transform attribute --> + <xsl:variable name="smallcase" select="'abcdefghijklmnopqrstuvwxyz'" /> + <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" /> + + <!-- Text Colour --> + <xsl:variable name="colour"> + <xsl:choose> + <xsl:when test="@color != ''"> + <xsl:value-of select="translate(@color, $smallcase, $uppercase)" /> + </xsl:when> + <xsl:otherwise> + black + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + + <xsl:for-each select="line"> + + <!-- x_height --> + <xsl:variable name="x_height"> + <xsl:value-of select="@x_height" /> + </xsl:variable> + + <!-- a_height --> + <xsl:variable name="a_height"> + <xsl:value-of select="@a_height" /> + </xsl:variable> + + + <!-- ABS(d_height) --> + <xsl:variable name="d_height_abs"> + <xsl:choose> + <xsl:when test="@d_height < 0"> + <xsl:value-of select="-@d_height" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="@d_height" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- a_height computed, i.e> + if (A - X < |D|) + A = X + |D| --> - <xsl:variable name="a"> - <xsl:choose> - <xsl:when test="($a_height - $x_height) < $d_height_abs"> - <xsl:value-of select="$x_height + $d_height_abs" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$a_height" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <!-- d_height computed, i.e> - if (A - A > |D|) - |D| = A - X + <xsl:variable name="a"> + <xsl:choose> + <xsl:when test="($a_height - $x_height) < $d_height_abs"> + <xsl:value-of select="$x_height + $d_height_abs" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$a_height" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- d_height computed, i.e> + if (A - A > |D|) + |D| = A - X --> - <xsl:variable name="d"> - <xsl:choose> - <xsl:when test="($a_height - $x_height) > $d_height_abs"> - <xsl:value-of select="$a_height - $x_height" /> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$d_height_abs" /> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <!-- Text lines coordinates --> - <xsl:variable name="y1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@y" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@y" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> - - <xsl:variable name="ymax"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@y" order="ascending" data-type="number"/> - <xsl:if test="position() = 3"> - <xsl:value-of select="@y" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> - - <xsl:variable name="x1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@x" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@x" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> - - <xsl:variable name="xmax"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@x" order="ascending" data-type="number"/> - <xsl:if test="position() = 3"> - <xsl:value-of select="@x" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> - <!-- END OF lines coordinates --> - - <!-- WTF !?, Necessary to do a lower-case ! - FIXME: take a look at text-transform attribute --> - <xsl:variable name="smallcase" select="'abcdefghijklmnopqrstuvwxyz'" /> - <xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" /> - - <!-- Text Colour --> - <xsl:variable name="colour"> - <xsl:choose> - <xsl:when test="@txt_colour != ''"> - <xsl:value-of select="translate(@txt_colour, $smallcase, $uppercase)" /> - </xsl:when> - <xsl:otherwise> - black - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - - <fo:block-container position="absolute" border-width="5mm"> - - <xsl:attribute name="left"> - <xsl:value-of select="$x1" />px - </xsl:attribute> - <xsl:attribute name="top"> - <xsl:value-of select="$y1" />px - </xsl:attribute> - - <xsl:attribute name="right"> - <xsl:value-of select="$xmax" />px - </xsl:attribute> - <xsl:attribute name="bottom"> - <xsl:value-of select="$ymax" />px - </xsl:attribute> - - - <xsl:attribute name="width"> - <xsl:value-of select="$xmax - $x1" />px - </xsl:attribute> - - <xsl:attribute name="color"> - <xsl:value-of select="$colour" /> - </xsl:attribute> - - <!-- if necessary, put letter-spacing="-Npt" ~ -3 <= N <= -1 - in fo:block--> - - <!-- text-align-last="justify" will help justifying and using a - uniform font size (it stretchs the text, at least for PDF) - but it relies on several lines... We need paragraph - information. - --> - - <!-- FIXME: using a table allows to justify a single line of - text. This is an UGLY HACK. Font size is also tweaked for - now but it should not since we have font information. - --> - <fo:table table-layout="fixed"> - - <xsl:attribute name="width"> - <xsl:value-of select="$xmax -$x1" />px - </xsl:attribute> - - <fo:table-column column-number="1"> - <xsl:attribute name="column-width"> - <xsl:value-of select="$xmax -$x1" />px - </xsl:attribute> - </fo:table-column> - - <fo:table-body start-indent="0pt" text-align="justify" text-align-last="justify"> - - <fo:table-row> - - <fo:table-cell> - - <fo:block font-family="Times" wrap-option="no-wrap" white-space-collapse="true" text-align-last="justify" text-align="justify"> - - <xsl:attribute name="font-size"> - <xsl:choose> - <xsl:when test="($a + $d) > 50"> - <xsl:value-of select="0.82 * ($a + $d)" />px - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="0.95 * ($a + $d)" />px - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - - <xsl:value-of select="@text"/> - </fo:block> - - </fo:table-cell> - - </fo:table-row> - - </fo:table-body> - - </fo:table> - - - </fo:block-container> + <xsl:variable name="d"> + <xsl:choose> + <xsl:when test="($a_height - $x_height) > $d_height_abs"> + <xsl:value-of select="$a_height - $x_height" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$d_height_abs" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <!-- Text lines coordinates --> + <xsl:variable name="y1"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@y" order="ascending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@y" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="ymax"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@y" order="ascending" data-type="number"/> + <xsl:if test="position() = 3"> + <xsl:value-of select="@y" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="x1"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@x" order="ascending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@x" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="xmax"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@x" order="ascending" data-type="number"/> + <xsl:if test="position() = 3"> + <xsl:value-of select="@x" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <!-- END OF lines coordinates --> + + <fo:block-container position="absolute" border-width="5mm"> + + <xsl:attribute name="left"> + <xsl:value-of select="$x1" />px + </xsl:attribute> + <xsl:attribute name="top"> + <xsl:value-of select="$y1" />px + </xsl:attribute> + + <xsl:attribute name="right"> + <xsl:value-of select="$xmax" />px + </xsl:attribute> + <xsl:attribute name="bottom"> + <xsl:value-of select="$ymax" />px + </xsl:attribute> + + + <xsl:attribute name="width"> + <xsl:value-of select="$xmax - $x1" />px + </xsl:attribute> + + <xsl:attribute name="color"> + <xsl:value-of select="$colour" /> + </xsl:attribute> + + <!-- if necessary, put letter-spacing="-Npt" ~ -3 <= N <= -1 + in fo:block--> + + <!-- text-align-last="justify" will help justifying and using a + uniform font size (it stretchs the text, at least for PDF) + but it relies on several lines... We need paragraph + information. + --> + + <!-- FIXME: using a table allows to justify a single line of + text. This is an UGLY HACK. Font size is also tweaked for + now but it should not since we have font information. + --> + <fo:table table-layout="fixed"> + + <xsl:attribute name="width"> + <xsl:value-of select="$xmax -$x1" />px + </xsl:attribute> + + <fo:table-column column-number="1"> + <xsl:attribute name="column-width"> + <xsl:value-of select="$xmax -$x1" />px + </xsl:attribute> + </fo:table-column> + + <fo:table-body start-indent="0pt" text-align="justify" text-align-last="justify"> + + <fo:table-row> + + <fo:table-cell> + + <fo:block font-family="Times" wrap-option="no-wrap" white-space-collapse="true" text-align-last="justify" text-align="justify"> + + <xsl:attribute name="font-size"> + <xsl:choose> + <xsl:when test="($a + $d) > 50"> + <xsl:value-of select="0.82 * ($a + $d)" />px + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="0.95 * ($a + $d)" />px + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + + <xsl:value-of select="@text"/> + </fo:block> + + </fo:table-cell> + + </fo:table-row> + + </fo:table-body> + + </fo:table> + + + </fo:block-container> + + </xsl:for-each> </xsl:template> diff --git a/scribo/demo/xml2doc/templates/pdf/regions.xsl b/scribo/demo/xml2doc/templates/pdf/regions.xsl index f236a1f..7772cbf 100644 --- a/scribo/demo/xml2doc/templates/pdf/regions.xsl +++ b/scribo/demo/xml2doc/templates/pdf/regions.xsl @@ -18,21 +18,11 @@ <!-- Regions coordinates --> <xsl:variable name="y1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@y" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@y" /> - </xsl:if> - </xsl:for-each> + <xsl:value-of select="@y_min" /> </xsl:variable> <xsl:variable name="x1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@x" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@x" /> - </xsl:if> - </xsl:for-each> + <xsl:value-of select="@x_min" /> </xsl:variable> <!-- END OF regions coordinates --> -- 1.5.6.5