diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b33cce54a..2963961bdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -329,7 +329,7 @@ Changed: Fixed: - * As a workaround for tensorflow compatiblity, require `numpy < 1.19.0`, #620 + * As a workaround for tensorflow compatibility, require `numpy < 1.19.0`, #620 ## [2.17.1] - 2020-10-05 @@ -560,7 +560,7 @@ Changed: * `Workspace.remove_file`: Optional `page_same_gropup` parameter to remove only those images linked in PAGE that are in the same group as the PAGE-XML * `Workspace.remove_file_gropup`: The same `page_recursive` and `page_same_gropup` parameters as `Workspace.remove_file` - * `WorkspaceValidator.check_file_grp` now accepts a `page_id` parameter and will no raise an error if an exisitng + * `WorkspaceValidator.check_file_grp` now accepts a `page_id` parameter and will not raise an error if an existing output file group is targeted but for pages that aren't in that group, #471 * `ocrd_cli_wrap_processor`: Take `page_id` into account when doing `WorkspaceValidator.check_file_grp` * `run_cli` accepts an `overwrite` parameter to pass on to processor calls, #471 diff --git a/README.md b/README.md index fc734ea75f..56ef4ce34f 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ pip install ocrd_modelfactory All python software released by [OCR-D](https://github.com/OCR-D) requires Python 3.6 or higher. -**NOTE** Some OCR-D-Tools (or even test cases) _might_ reveal an unintended behavior if you have specific enviroment modifications, like: +**NOTE** Some OCR-D-Tools (or even test cases) _might_ reveal an unintended behavior if you have specific environment modifications, like: * using a custom build of [ImageMagick](https://github.com/ImageMagick/ImageMagick), whose format delegates are different from what OCR-D supposes * custom Python logging configurations in your personal account diff --git a/ocrd_models/ocrd_models/ocrd_page_generateds.py b/ocrd_models/ocrd_models/ocrd_page_generateds.py index 18f3673dc2..d95ea4b321 100644 --- a/ocrd_models/ocrd_models/ocrd_page_generateds.py +++ b/ocrd_models/ocrd_models/ocrd_page_generateds.py @@ -6318,7 +6318,7 @@ def replaceWithRRI(group): rri.index = group.index rri.regionRef = group.regionRef cleaned.append(rri) - # remove emtpy groups and replace with RegionRefIndexedType + # remove empty groups and replace with RegionRefIndexedType for entry in self.get_AllIndexed(): # pylint: disable=undefined-variable if isinstance(entry, (OrderedGroupIndexedType)) and not entry.get_AllIndexed(): @@ -7250,7 +7250,7 @@ def replaceWithRRI(group): rri.index = group.index rri.regionRef = group.regionRef cleaned.append(rri) - # remove emtpy groups and replace with RegionRefIndexedType + # remove empty groups and replace with RegionRefIndexedType for entry in self.get_AllIndexed(): # pylint: disable=undefined-variable if isinstance(entry, (OrderedGroupIndexedType)) and not entry.get_AllIndexed(): diff --git a/ocrd_models/ocrd_page_user_methods/exportChildren_GroupType.py b/ocrd_models/ocrd_page_user_methods/exportChildren_GroupType.py index 8f118b71be..924ee63146 100644 --- a/ocrd_models/ocrd_page_user_methods/exportChildren_GroupType.py +++ b/ocrd_models/ocrd_page_user_methods/exportChildren_GroupType.py @@ -11,7 +11,7 @@ def replaceWithRRI(group): rri.index = group.index rri.regionRef = group.regionRef cleaned.append(rri) - # remove emtpy groups and replace with RegionRefIndexedType + # remove empty groups and replace with RegionRefIndexedType for entry in self.get_AllIndexed(): # pylint: disable=undefined-variable if isinstance(entry, (OrderedGroupIndexedType)) and not entry.get_AllIndexed(): diff --git a/ocrd_utils/README.md b/ocrd_utils/README.md index 8ace1645f8..a8e5cee6dd 100644 --- a/ocrd_utils/README.md +++ b/ocrd_utils/README.md @@ -9,12 +9,12 @@ See https://github.com/OCR-D/core File-based control over logging facilities is done with standard [Python 3 logging module configuration files](https://docs.python.org/3.6/howto/logging.html#configuring-logging). This way, the level, format and destinations of log messages can be customized for all OCR-D modules individually and persistently, in the usual syntax. -A template configuration file (with commented examples) is included in [ocrd_logging.conf](./ocrd_logging.conf). This is meant as an example, and should be **customized**. +A template configuration file (with commented examples) is included in [ocrd_logging.conf](./ocrd_logging.conf). This is meant as an example, and should be **customized**. To get into effect, you must put a copy (under the same name) into: -1. your current working directory, +1. your current working directory, 2. your user directory, or -3. `/etc`. +3. `/etc`. These directories are searched in said order, and the first find wins. When no config file is found, the default logging configuration applies (which uses only stdout and the `INFO` loglevel for most loggers, cf. [here](./ocrd_logging.py)). Thus, a configuration file will override *all* settings from the default configuration, and from configuration files in lower-priority directories. @@ -23,7 +23,7 @@ For more information about logging, handlers and formats, see [Python documentat #### Docker containers -In the Dockerfiles used to build `ocrd/core` (and subsequently `ocrd/all`), the above mentioned template is directly copied to `/etc/ocrd_logging.conf` within the container image. This cofiguration is thereby also the default configuration for OCR-D containers. +In the Dockerfiles used to build `ocrd/core` (and subsequently `ocrd/all`), the above mentioned template is directly copied to `/etc/ocrd_logging.conf` within the container image. This configuration is thereby also the default configuration for OCR-D containers. Thus, if you want to customize logging rules in one of these Docker containers, you can create a custom configuration file and either: - place it into your local workspace directory when running the OCR-D container. diff --git a/ocrd_utils/ocrd_logging.conf b/ocrd_utils/ocrd_logging.conf index 7177f6f173..3383b4f54d 100644 --- a/ocrd_utils/ocrd_logging.conf +++ b/ocrd_utils/ocrd_logging.conf @@ -7,7 +7,7 @@ # is found, the default logging configuration applies (cf. ocrd.logging.py). # # mandatory loggers section -# configure loggers with correspnding keys "root", "" +# configure loggers with corresponding keys "root", "" # each logger requires a corresponding configuration section below # [loggers] @@ -45,8 +45,8 @@ handlers=consoleHandler # example logger "ocrd_workspace" uses fileHandler and overrides # default log level "INFO" with custom level "DEBUG" # "qualname" must match the logger label used in the corresponding -# ocrd modul -# see in the modul-of-interrest (moi) +# ocrd module +# see in the module-of-interest (moi) # #[logger_ocrd_workspace] #level=DEBUG diff --git a/ocrd_validators/ocrd_validators/mets.xsd b/ocrd_validators/ocrd_validators/mets.xsd index 1ae113fb08..7464f542c9 100644 --- a/ocrd_validators/ocrd_validators/mets.xsd +++ b/ocrd_validators/ocrd_validators/mets.xsd @@ -211,7 +211,7 @@ 3. Add an MDTYPEVERSION attribute as a companion to the MDTYPE attribute in the mdRef and mdWrap elements. 4. ID and STRUCTID attributes on the behavior element made optional. Depending on whether the behavior applies to a transformFile element or div elements in the structMap, only one or the other of the attributes would pertain. 5. Documentation aligned with the METS Primer, and corrected. - 6. xml:lang="en" atttribute value added to every <documentation> element + 6. xml:lang="en" attribute value added to every <documentation> element 7. xlink:extendedLink support added to the <structLink> element by means of a new <smLinkGrp> element, and its child <smLocatorLink> and <smArcLink> elements.