diff options
| author | Max Gaukler <development@maxgaukler.de> | 2018-09-11 14:05:17 +0000 |
|---|---|---|
| committer | Max Gaukler <development@maxgaukler.de> | 2018-11-08 17:18:20 +0000 |
| commit | 79d82382b3ea1b7d77e3a47a96a786557588787a (patch) | |
| tree | e2729fa6bb00d24ac6140cafabb9cf9b94ffa01b /src/libnrtype | |
| parent | Implement the remaining vector effects properties. (diff) | |
| download | inkscape-79d82382b3ea1b7d77e3a47a96a786557588787a.tar.gz inkscape-79d82382b3ea1b7d77e3a47a96a786557588787a.zip | |
Clarify licenses
- add license headers to everything
- convert a few files from public domain or LGPL2.1+ to GPL2+
- some archaeology to clarify which files are from which library
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 12 | ||||
| -rw-r--r-- | src/libnrtype/FontFactory.h | 9 | ||||
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 12 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Compute.cpp | 3 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Input.cpp | 3 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-OutIter.cpp | 3 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Output.cpp | 3 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Scanline-Maker.h | 3 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Scanline-Makers.cpp | 3 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG.cpp | 3 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG.h | 3 | ||||
| -rw-r--r-- | src/libnrtype/OpenTypeUtil.cpp | 9 | ||||
| -rw-r--r-- | src/libnrtype/OpenTypeUtil.h | 9 | ||||
| -rw-r--r-- | src/libnrtype/font-glyph.h | 9 | ||||
| -rw-r--r-- | src/libnrtype/font-instance.h | 9 | ||||
| -rw-r--r-- | src/libnrtype/font-lister.cpp | 10 | ||||
| -rw-r--r-- | src/libnrtype/font-lister.h | 3 | ||||
| -rw-r--r-- | src/libnrtype/font-style.h | 9 |
19 files changed, 97 insertions, 19 deletions
diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt index 3061e9304..42ff9d2ca 100644 --- a/src/libnrtype/CMakeLists.txt +++ b/src/libnrtype/CMakeLists.txt @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later set(nrtype_SRC FontFactory.cpp diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 74b68fc3f..27f8b57d0 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -1,11 +1,13 @@ -/* - * FontFactory.cpp - * testICU - * - * Authors: +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: * fred * bulia byak <buliabyak@users.sf.net> * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifdef HAVE_CONFIG_H diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h index 085410169..547b8aa83 100644 --- a/src/libnrtype/FontFactory.h +++ b/src/libnrtype/FontFactory.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ /* * FontFactory.h * testICU diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index 7358deac0..c2abfb3f2 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -1,11 +1,13 @@ -/* - * FontInstance.cpp - * testICU - * - * Authors: +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: * fred * bulia byak <buliabyak@users.sf.net> * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifdef HAVE_CONFIG_H diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp index e9cf22e31..54780b5fc 100644 --- a/src/libnrtype/Layout-TNG-Compute.cpp +++ b/src/libnrtype/Layout-TNG-Compute.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape::Text::Layout::Calculator - text layout engine meaty bits * @@ -6,7 +7,7 @@ * * Copyright (C) 2005 Richard Hughes * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "Layout-TNG.h" #include "style.h" diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp index cdaee3ad8..a20fdde53 100644 --- a/src/libnrtype/Layout-TNG-Input.cpp +++ b/src/libnrtype/Layout-TNG-Input.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape::Text::Layout - text layout engine input functions * @@ -6,7 +7,7 @@ * * Copyright (C) 2005 Richard Hughes * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifdef HAVE_CONFIG_H diff --git a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp index e28c9b168..d565bb923 100644 --- a/src/libnrtype/Layout-TNG-OutIter.cpp +++ b/src/libnrtype/Layout-TNG-OutIter.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape::Text::Layout - text layout engine output functions using iterators * @@ -6,7 +7,7 @@ * * Copyright (C) 2005 Richard Hughes * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "Layout-TNG.h" #include "livarot/Path.h" diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index 81710b471..014c2c521 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape::Text::Layout - text layout engine output functions * @@ -6,7 +7,7 @@ * * Copyright (C) 2005 Richard Hughes * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifdef HAVE_CONFIG_H diff --git a/src/libnrtype/Layout-TNG-Scanline-Maker.h b/src/libnrtype/Layout-TNG-Scanline-Maker.h index dea9aa3c5..c8c823249 100644 --- a/src/libnrtype/Layout-TNG-Scanline-Maker.h +++ b/src/libnrtype/Layout-TNG-Scanline-Maker.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape::Text::Layout::ScanlineMaker - text layout engine shape measurers * @@ -6,7 +7,7 @@ * * Copyright (C) 2005 Richard Hughes * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef __LAYOUT_TNG_SCANLINE_MAKER_H__ #define __LAYOUT_TNG_SCANLINE_MAKER_H__ diff --git a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp index 78b805003..8398bf145 100644 --- a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp +++ b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape::Text::Layout::ScanlineMaker - text layout engine shape measurers * @@ -6,7 +7,7 @@ * * Copyright (C) 2005 Richard Hughes * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "Layout-TNG-Scanline-Maker.h" #include "livarot/Shape.h" diff --git a/src/libnrtype/Layout-TNG.cpp b/src/libnrtype/Layout-TNG.cpp index a9e70a74b..e937e9da9 100644 --- a/src/libnrtype/Layout-TNG.cpp +++ b/src/libnrtype/Layout-TNG.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape::Text::Layout - text layout engine misc * @@ -6,7 +7,7 @@ * * Copyright (C) 2005 Richard Hughes * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include "Layout-TNG.h" diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index 6c68ae913..e5317b501 100644 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Inkscape::Text::Layout - text layout engine * @@ -6,7 +7,7 @@ * * Copyright (C) 2005 Richard Hughes * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #ifndef __LAYOUT_TNG_H__ #define __LAYOUT_TNG_H__ diff --git a/src/libnrtype/OpenTypeUtil.cpp b/src/libnrtype/OpenTypeUtil.cpp index 25e4f7094..08cec5468 100644 --- a/src/libnrtype/OpenTypeUtil.cpp +++ b/src/libnrtype/OpenTypeUtil.cpp @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef USE_PANGO_WIN32 diff --git a/src/libnrtype/OpenTypeUtil.h b/src/libnrtype/OpenTypeUtil.h index ef32e76f3..5c8ca7d80 100644 --- a/src/libnrtype/OpenTypeUtil.h +++ b/src/libnrtype/OpenTypeUtil.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef SEEN_OPENTYPEUTIL_H #define SEEN_OPENTYPEUTIL_H diff --git a/src/libnrtype/font-glyph.h b/src/libnrtype/font-glyph.h index 3f136daaf..5dcb93321 100644 --- a/src/libnrtype/font-glyph.h +++ b/src/libnrtype/font-glyph.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2011 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef SEEN_LIBNRTYPE_FONT_GLYPH_H #define SEEN_LIBNRTYPE_FONT_GLYPH_H diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h index 0834ace04..1dd77dfb2 100644 --- a/src/libnrtype/font-instance.h +++ b/src/libnrtype/font-instance.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef SEEN_LIBNRTYPE_FONT_INSTANCE_H #define SEEN_LIBNRTYPE_FONT_INSTANCE_H diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 3cd97fa8e..739b0b14b 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -1,3 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ + #include <glibmm/markup.h> #include <glibmm/regex.h> diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h index 358340c76..16c34d94c 100644 --- a/src/libnrtype/font-lister.h +++ b/src/libnrtype/font-lister.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FONT_LISTER_H #define FONT_LISTER_H @@ -13,7 +14,7 @@ * Copyright (C) 2002 Lauris Kaplinski * Copyright (C) 2013 Tavmjong Bah * - * Released under GNU GPL, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information. */ #include <map> diff --git a/src/libnrtype/font-style.h b/src/libnrtype/font-style.h index 1ed82e89c..23a26d60f 100644 --- a/src/libnrtype/font-style.h +++ b/src/libnrtype/font-style.h @@ -1,3 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/** @file + * TODO: insert short description here + *//* + * Authors: see git history + * + * Copyright (C) 2018 Authors + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ #ifndef SEEN_LIBNRTYPE_FONT_STYLE_H #define SEEN_LIBNRTYPE_FONT_STYLE_H |
