[liblouis-liblouisxml] [liblouis/liblouis] dbe525: Fix a few problems with the merge

  • From: Christian Egli <christian.egli@xxxxxx>
  • To: liblouis-liblouisxml@xxxxxxxxxxxxx
  • Date: Mon, 21 Dec 2015 07:08:10 -0800

Branch: refs/heads/feature/ueb_update
Home: https://github.com/liblouis/liblouis
Commit: dbe525cfc325aaa0967ac93b9f8e454c6758c7f0

https://github.com/liblouis/liblouis/commit/dbe525cfc325aaa0967ac93b9f8e454c6758c7f0
Author: Christian Egli <christian.egli@xxxxxx>
Date: 2015-12-18 (Fri, 18 Dec 2015)

Changed paths:
M tests/Makefile.am
A tests/yaml/en-ueb-symbols_harness.yaml

Log Message:
-----------
Fix a few problems with the merge


Commit: 304339d44667edcaed96b1b1ad33fd8ec577848b

https://github.com/liblouis/liblouis/commit/304339d44667edcaed96b1b1ad33fd8ec577848b
Author: Christian Egli <christian.egli@xxxxxx>
Date: 2015-12-21 (Mon, 21 Dec 2015)

Changed paths:
M doc/liblouis.texi
M tests/brl_checks.c
M tests/brl_checks.h
M tests/check_yaml.c
M tests/yaml/en-ueb-g1_harness.txt.bak.yaml
M tests/yaml/en-ueb-g1_harness.yaml
M tests/yaml/en-ueb-symbols_harness.yaml
M tests/yaml/en-us-g2-end-emphasis_harness.txt.bak.yaml
M tests/yaml/en-us-g2-end-emphasis_harness.yaml
M tests/yaml/example_test.yaml
M tests/yaml/fi_harness.yaml
M tests/yaml/foo.yaml
M tests/yaml/nl-BE-g0_harness.yaml
M tests/yaml/nl-NL-g0_harness.yaml
M tests/yaml/no_harness.yaml

Log Message:
-----------
Add support for all typeforms in YAML tests

Typeforms are no longer a string of ints but are now a map of key value
pairs. The keys are the kind of emphasis such as bold, italic,
underline, etc. The values are strings where all non-space characters
set the respective position to the emphasis indicated by the key.

- update check_yaml and brl_checks
- update the existing yaml tests
- update the documentation


Compare:
https://github.com/liblouis/liblouis/compare/bb9dc83ce97f...304339d44667

Other related posts:

  • » [liblouis-liblouisxml] [liblouis/liblouis] dbe525: Fix a few problems with the merge - Christian Egli