Skip to content

Commit e2f9e05

Browse files
committed
Squashed commit of the following:
commit 0dfb749 Author: Ko van der Sloot <Ko.vanderSloot@ziggo.nl> Date: Wed Dec 10 11:31:18 2025 +0100 better check on wrefs moving on to 2026 much simplified class init procedure better error messages
1 parent 09c7587 commit e2f9e05

27 files changed

+301
-239
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Libfolia: FoLiA Library for C++
77
===================================
88

9-
Libfolia (c) CLS/ILK 2010 - 2024
9+
Libfolia (c) CLS/ILK 2010 - 2026
1010
Centre for Language Studies, Radboud University Nijmegen
1111
Induction of Linguistic Knowledge Research Group, Tilburg University
1212
KNAW Humanities Cluster

codemeta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@type": "SoftwareSourceCode",
88
"identifier": "libfolia",
99
"name": "libfolia",
10-
"version": "2.21.1",
10+
"version": "2.22",
1111
"description": "This is a C++ Library for working with the Format for Linguistic Annotation (FoLiA).",
1212
"license": "https://spdx.org/licenses/GPL-3.0-only",
1313
"url": "https://github.com/LanguageMachines/libfolia",

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([libfolia],[2.21.1],[lamasoftware@science.ru.nl]) #also adapt in codemeta.json!
5+
AC_INIT([libfolia],[2.22],[lamasoftware@science.ru.nl]) #also adapt in codemeta.json!
66
AM_INIT_AUTOMAKE([foreign])
77
AC_CONFIG_SRCDIR([configure.ac])
88
AC_CONFIG_MACRO_DIR([m4])

docs/dox.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,8 +943,8 @@ WARN_LOGFILE =
943943
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
944944
# Note: If this tag is empty the current directory is searched.
945945

946-
INPUT = ./src \
947-
./include/libfolia
946+
INPUT = ../src \
947+
../include/libfolia
948948

949949
# This tag can be used to specify the character encoding of the source files
950950
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

include/libfolia/folia.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2006 - 2024
2+
Copyright (c) 2006 - 2026
33
CLST - Radboud University
44
ILK - Tilburg University
55

include/libfolia/folia_document.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2006 - 2024
2+
Copyright (c) 2006 - 2026
33
CLST - Radboud University
44
ILK - Tilburg University
55
@@ -505,15 +505,15 @@ namespace folia {
505505
};
506506

507507
using DocMode = Document::RUN_FLAGS;
508-
DEFINE_ENUM_FLAG_OPERATORS(DocMode);
508+
DEFINE_ENUM_FLAG_OPERATORS(DocMode)
509509

510-
inline bool Document::permissive() const { return mode % DocMode::PERMISSIVE; };
511-
inline bool Document::checktext() const { return mode % DocMode::CHECKTEXT; };
512-
inline bool Document::fixtext() const { return mode % DocMode::FIXTEXT; };
513-
inline bool Document::strip() const { return mode % DocMode::STRIP; };
514-
inline bool Document::canonical() const { return mode % DocMode::CANONICAL; };
515-
inline bool Document::autodeclare() const { return mode % DocMode::AUTODECLARE; };
516-
inline bool Document::has_explicit() const { return mode % DocMode::EXPLICIT; };
510+
inline bool Document::permissive() const { return mode % DocMode::PERMISSIVE; }
511+
inline bool Document::checktext() const { return mode % DocMode::CHECKTEXT; }
512+
inline bool Document::fixtext() const { return mode % DocMode::FIXTEXT; }
513+
inline bool Document::strip() const { return mode % DocMode::STRIP; }
514+
inline bool Document::canonical() const { return mode % DocMode::CANONICAL; }
515+
inline bool Document::autodeclare() const { return mode % DocMode::AUTODECLARE; }
516+
inline bool Document::has_explicit() const { return mode % DocMode::EXPLICIT; }
517517

518518
template <> inline
519519
Text *Document::create_root( const KWargs& args ){
@@ -550,7 +550,7 @@ namespace folia {
550550
std::string folia_version();
551551
using DocDbg = Document::DEBUG_FLAGS;
552552
std::string toString( DocDbg mode );
553-
DEFINE_ENUM_FLAG_OPERATORS(DocDbg);
553+
DEFINE_ENUM_FLAG_OPERATORS(DocDbg)
554554
std::ostream& operator<<( std::ostream&, const DocDbg& );
555555
extern TiCC::LogStream *_dbg_file; //!< the debugging stream
556556
} // namespace folia

include/libfolia/folia_engine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2006 - 2024
2+
Copyright (c) 2006 - 2026
33
CLST - Radboud University
44
ILK - Tilburg University
55

include/libfolia/folia_impl.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2006 - 2024
2+
Copyright (c) 2006 - 2026
33
CLST - Radboud University
44
ILK - Tilburg University
55
@@ -102,7 +102,6 @@ namespace folia {
102102
virtual ~FoliaElement(){};
103103
public:
104104
virtual void destroy() = 0;
105-
virtual void init() {};
106105
virtual size_t size() const = 0;
107106
virtual FoliaElement* index( size_t ) const = 0;
108107
virtual FoliaElement* opaque_index( size_t ) const = 0;
@@ -393,6 +392,7 @@ namespace folia {
393392
virtual bool hasCurrent() const NOT_IMPLEMENTED;
394393
virtual Current *getCurrent() const NOT_IMPLEMENTED;
395394
virtual FoliaElement *getCurrent( size_t ) const NOT_IMPLEMENTED;
395+
virtual bool hasSuggestions() const NOT_IMPLEMENTED;
396396
virtual Correction *incorrection() const NOT_IMPLEMENTED;
397397
virtual Correction *split( FoliaElement *, FoliaElement *,
398398
const std::string& = "" ) NOT_IMPLEMENTED;
@@ -596,7 +596,6 @@ namespace folia {
596596
virtual ~AbstractElement() override;
597597
public:
598598
void destroy() override;
599-
void classInit();
600599
void classInit( const KWargs& );
601600

602601
//functions regarding contained data

include/libfolia/folia_metadata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2006 - 2024
2+
Copyright (c) 2006 - 2026
33
CLST - Radboud University
44
ILK - Tilburg University
55

include/libfolia/folia_properties.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2006 - 2024
2+
Copyright (c) 2006 - 2026
33
CLST - Radboud University
44
ILK - Tilburg University
55

0 commit comments

Comments
 (0)