~ubuntu-branches/ubuntu/trusty/libitext-java/trusty

« back to all changes in this revision

Viewing changes to core/com/lowagie/text/Phrase.java

  • Committer: Bazaar Package Importer
  • Author(s): Michael Koch
  • Date: 2009-10-02 21:23:15 UTC
  • mfrom: (5.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091002212315-br9lwonsyo2jgycx
* New upstream release (Closes: #549347).
* Build-Depends on libbctsp-java.
* Build-Depends on debhelper (>= 7).
* Added missing Depends on ${misc:Depends}.
* Added Vcs-Svn and Vcs-Browser fields.
* Updated Standards-Version 3.8.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*
2
 
 * $Id: Phrase.java 3373 2008-05-12 16:21:24Z xlv $
 
2
 * $Id: Phrase.java 3942 2009-05-28 18:14:10Z blowagie $
3
3
 *
4
4
 * Copyright 1999, 2000, 2001, 2002 by Bruno Lowagie.
5
5
 *
278
278
                if (!font.isStandardFont()) {
279
279
                    chunk.setFont(font.difference(chunk.getFont()));
280
280
                }
281
 
                if (hyphenation != null) {
 
281
                if (hyphenation != null && chunk.getHyphenation() == null && !chunk.isEmpty()) {
282
282
                        chunk.setHyphenation(hyphenation);
283
283
                }
284
284
                super.add(index, chunk);
400
400
        }
401
401
        Chunk newChunk = new Chunk(c, f);
402
402
        newChunk.setAttributes(chunk.getAttributes());
403
 
        if (newChunk.getHyphenation() == null) {
 
403
        if (hyphenation != null && newChunk.getHyphenation() == null && !newChunk.isEmpty()) {
404
404
                newChunk.setHyphenation(hyphenation);
405
405
        }
406
406
        return super.add(newChunk);