[yaala] Back into game

[qMax]

------------FCD7CC2BF7578
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

First patch just fixes option "use_persistent" which was ignored when
saving data.

Another patch implements option "classic_ignore_empty" for combined
report (should it now be just "ignore_empty"?).
The header of 1st key is not rowspanned when enables.

Good luck.


-- 
 qMax
------------FCD7CC2BF7578
Content-Type: application/octet-stream; name="Option_use_persistent.diff"
Content-transfer-encoding: base64
Content-Disposition: attachment; filename="Option_use_persistent.diff"

LS0tIHlhYWxhLm9yaWcvbGliL1lhYWxhL0RhdGEvUGVyc2lzdGVudC5wbQlUaHUgRGVjIDEx
IDIwOjEzOjMzIDIwMDMKKysrIHlhYWxhL2xpYi9ZYWFsYS9EYXRhL1BlcnNpc3RlbnQucG0J
VHVlIE5vdiAgMiAxNDowNjowMyAyMDA0CkBAIC0yMTgsNyArMjE4LDcgQEAKIAogRU5ECiB7
Ci0JaWYgKCRIQVZFX1NUT1JBQkxFKQorCWlmICgkSEFWRV9TVE9SQUJMRSBhbmQgJFdBTlRf
UEVSU0lTVEVOQ1kpCiAJewogCQlwcmludCBTVERFUlIgJC8sIF9fRklMRV9fLCAiOiBXcml0
aW5nIHBlcnNpc3RlbnQgZGF0YSB0byBgYCRGSUxFTkFNRScnIiBpZiAoJDo6REVCVUcpOwog
CQlzdG9yZSAoJERBVEFfU1RSVUNUVVJFLCAkRklMRU5BTUUpOwo=
------------FCD7CC2BF7578
Content-Type: application/octet-stream; name="Option_ignore_empty_in_combined.patch"
Content-transfer-encoding: base64
Content-Disposition: attachment; filename="Option_ignore_empty_in_combined.patch"

LS0tIHlhYWxhLm9yaWcvbGliL1lhYWxhL1JlcG9ydC9Db21iaW5lZC5wbQlUaHUgRGVjIDEx
IDIwOjEzOjMzIDIwMDMKKysrIHlhYWxhL2xpYi9ZYWFsYS9SZXBvcnQvQ29tYmluZWQucG0J
VHVlIE5vdiAgMiAxNzo1OToyOSAyMDA0CkBAIC0zMCw2ICszMCwxMyBAQAogCX0KIH0KIAor
b3VyICRza2lwX2VtcHR5ID0gMTsKK2lmIChnZXRfY29uZmlnICgnY2xhc3NpY19za2lwX2Vt
cHR5JykpCit7CisJbXkgJGNvbmYgPSBsYyAoZ2V0X2NvbmZpZyAoJ2NsYXNzaWNfc2tpcF9l
bXB0eScpKTsKKwlpZiAoJGNvbmYgZXEgJ25vJyBvciAkY29uZiBlcSAnZmFsc2UnKSB7ICRz
a2lwX2VtcHR5ID0gMDsgfQorfQorCiByZXR1cm4gKDEpOwogCiBzdWIgZ2VuZXJhdGUKQEAg
LTIxNCw3ICsyMjEsNiBAQAogCQkJbXkgJGFnZyA9ICRfOwogCQkJbXkgJHN1bSA9IHJlY2Vp
dmUgKCRzZWwsICRhZ2csIHska2V5ID0+ICR2YWx9KTsKIAkJCW15ICRwcmludF9zdW0gPSBj
b252ZXJ0ICgkYWdnLCAkc3VtKTsKLQkJCiAJCQkkdGV4dCAuPSBxcSM8L3RoPlxuICAgIDx0
ZD4kcHJpbnRfc3VtPC90ZD5cbiMKIAkJCS4JIiAgICA8dGQ+IiAuIHNwcmludGYgKCIlLjFm
JSUiLCAxMDAgKiAkc3VtIC8gJGdyYW5kX3RvdGFseyRhZ2d9KSAuICI8L3RkPlxuIjsKIAkJ
fQpAQCAtMzA1LDkgKzMxMSwxNiBAQAogCX0KIAkKIAkjIGZpcnN0IGxpbmUKLQkkdGV4dCAu
PSBxcSMgIDx0cj5cbiAgICA8dGQgY29sc3Bhbj0iMiIgcm93c3Bhbj0iIyAuICgkbnVtX2Fn
Z3MgPiAxID8gJzMnIDogJzInKQotCS4gcXEjIiBjbGFzcz0iYmxhbmsiPjxpbWcgc3JjPSJs
b2dvLnBuZyIgLz48L3RkPlxuIwotCS4gJyAgICA8dGggY29sc3Bhbj0iJyAuICgkbnVtX2Fn
Z3MgKiBzY2FsYXIgKEB2YWxzMikpIC4gcXEjIj4jIC4gdWNmaXJzdCAoJGtleTIpIC4gIjwv
dGg+XG4iCisJaWYoICRza2lwX2VtcHR5ICkgeworCSAgICAkdGV4dCAuPSBxcSMgIDx0cj5c
biAgICA8dGggcm93c3Bhbj0iIyAuICgkbnVtX2FnZ3MgPiAxID8gJzMnIDogJzInKQorCSAg
ICAuIHFxIyI+IyAuIHVjZmlyc3QgKCRrZXkxKSAuICI8L3RoPlxuIjsKKwkgICAgfQorCWVs
c2V7CisJICAgICR0ZXh0IC49IHFxIyAgPHRyPlxuICAgIDx0ZCBjb2xzcGFuPSIyIiByb3dz
cGFuPSIjIC4gKCRudW1fYWdncyA+IDEgPyAnMycgOiAnMicpCisJCS4gcXEjIiBjbGFzcz0i
YmxhbmsiPjxpbWcgc3JjPSJsb2dvLnBuZyIgLz48L3RkPlxuIzsKKwkgICAgfQorCSR0ZXh0
IC49CisJICAnICAgIDx0aCBjb2xzcGFuPSInIC4gKCRudW1fYWdncyAqIHNjYWxhciAoQHZh
bHMyKSkgLiBxcSMiPiMgLiB1Y2ZpcnN0ICgka2V5MikgLiAiPC90aD5cbiIKIAkuIHFxIyAg
ICA8dGggcm93c3Bhbj0iMiIkYWdnX2NvbHVtbl93aWR0aD5Ub3RhbDwvdGg+XG4jCiAJLiBx
cSMgICAgPHRoIHJvd3NwYW49IjIiJGFnZ19jb2x1bW5fd2lkdGg+UGVyY2VudDwvdGg+XG4j
CiAJLiAiICA8L3RyPlxuIjsKQEAgLTMzMCwxOSArMzQzLDI1IEBACiAJCQogCQkkdGV4dCAu
PSAiICA8L3RyPlxuIjsKIAl9Ci0JJHRleHQgLj0gcXEjICA8dHI+XG4gICAgPHRoIHJvd3Nw
YW49IiMgLiBzY2FsYXIgKEB2YWxzMSkKLQkuIHFxIyI+IyAuIHVjZmlyc3QgKCRrZXkxKSAu
ICI8L3RoPlxuIjsKIAkKLQlteSAkdGhpc19pc190aGVfZmlyc3RfbGluZSA9IDE7CisJbXkg
JHRoaXNfaXNfdGhlX2ZpcnN0X2xpbmUgPSAwOworCXVubGVzcyggJHNraXBfZW1wdHkgKSB7
CisJICAgICR0ZXh0IC49IHFxIyAgPHRyPlxuICAgIDx0aCByb3dzcGFuPSIjIC4gc2NhbGFy
IChAdmFsczEpCisJICAgIC4gcXEjIj4jIC4gdWNmaXJzdCAoJGtleTEpIC4gIjwvdGg+XG4i
OworCSAgICAkdGhpc19pc190aGVfZmlyc3RfbGluZSA9IDE7CisJICAgIH0KKwkKIAlmb3Ig
KEB2YWxzMSkKIAl7CiAJCW15ICR2YWwxID0gJF87CisJCW15ICRyb3d0ZXh0ID0gIiI7CiAK
LQkJJHRleHQgLj0gIiAgPHRyPlxuIiB1bmxlc3MgKCR0aGlzX2lzX3RoZV9maXJzdF9saW5l
KTsKKwkJJHJvd3RleHQgLj0gIiAgPHRyPlxuIiB1bmxlc3MgKCR0aGlzX2lzX3RoZV9maXJz
dF9saW5lKTsKIAkJJHRoaXNfaXNfdGhlX2ZpcnN0X2xpbmUgPSAwOwogCi0JCSR0ZXh0IC49
IHFxIyAgICA8dGggY2xhc3M9InN1YmhkciI+JHZhbDE8L3RoPlxuIzsKKwkJJHJvd3RleHQg
Lj0gcXEjICAgIDx0aCBjbGFzcz0ic3ViaGRyIj4kdmFsMTwvdGg+XG4jOwogCQkJCisJCW15
ICRlbXB0eSA9IDE7CiAJCWZvciAoQHZhbHMyKQogCQl7CiAJCQlteSAkdmFsMiA9ICRfOwpA
QCAtMzU5LDggKzM3OCw5IEBACiAJCQkKIAkJCQlteSAkdGhpc192YWwgPSByZWNlaXZlICgk
c2VsLCAkYWdnLCAkcXVlcnkpOwogCQkJCW15ICRwcmludF92YWwgPSBjb252ZXJ0ICgkYWdn
LCAkdGhpc192YWwpOworCQkJCSRlbXB0eSA9IDAgaWYoICR0aGlzX3ZhbCApOwogCQotCQkJ
CSR0ZXh0IC49ICcgICAgPHRkPicgLiAoJHByaW50X3ZhbCA/ICRwcmludF92YWwgOiAnJm5i
c3A7JykgLiAiPC90ZD5cbiI7CisJCQkJJHJvd3RleHQgLj0gJyAgICA8dGQ+JyAuICgkcHJp
bnRfdmFsID8gJHByaW50X3ZhbCA6ICcmbmJzcDsnKSAuICI8L3RkPlxuIjsKIAkJCX0KIAkJ
fQogCkBAIC0zNzUsMTYgKzM5NSwxOSBAQAogCQl7CiAJCQlteSAkdGhpc192YWwgPSByZWNl
aXZlICgkc2VsLCAkXywgJHF1ZXJ5KTsKIAkJCW15ICRwcmludF92YWwgPSBjb252ZXJ0ICgk
XywgJHRoaXNfdmFsKTsKKwkJCSRlbXB0eSA9IDAgaWYoICR0aGlzX3ZhbCApOwogCi0JCQkk
dGV4dCAuPSAnICAgIDx0ZCBjbGFzcz0idG90YWwiPicgLiAoJHByaW50X3ZhbCA/ICRwcmlu
dF92YWwgOiAnJm5ic3A7JykgLiAiPC90ZD5cbiI7CisJCQkkcm93dGV4dCAuPSAnICAgIDx0
ZCBjbGFzcz0idG90YWwiPicgLiAoJHByaW50X3ZhbCA/ICRwcmludF92YWwgOiAnJm5ic3A7
JykgLiAiPC90ZD5cbiI7CiAJCQkkdG1wIC49ICcgICAgPHRkIGNsYXNzPSJ0b3RhbCI+Jwog
CQkJLgkoJHRoaXNfdmFsID8gc3ByaW50ZiAoIiUuMWYlJSIsIDEwMCAqICR0aGlzX3ZhbCAv
ICRncmFuZF90b3RhbHskX30pIDogJyZuYnNwOycpCiAJCQkuCSI8L3RkPlxuIjsKIAkJfQot
CQkkdGV4dCAuPSAkdG1wIC4gIiAgPC90cj5cbiI7CisJCSRyb3d0ZXh0IC49ICR0bXAgLiAi
ICA8L3RyPlxuIjsKKwkJJHRleHQgLj0gJHJvd3RleHQgaWYoIG5vdCAkZW1wdHkgb3Igbm90
ICRza2lwX2VtcHR5KTsKKwkJCiAJfQogCSMgVE9ETyAyMDAzLTA1LTEwIDEzOjAwCi0JJHRl
eHQgLj0gcXEjICA8dHI+XG4gICAgPHRoIGNvbHNwYW49IjIiPlRvdGFsPC90aD5cbiM7CisJ
JHRleHQgLj0gcXEjICA8dHI+XG4gICAgPHRoIGNvbHNwYW49IiMuKCRza2lwX2VtcHR5ID8g
MSA6IDIpLnFxIyI+VG90YWw8L3RoPlxuIzsKIAlteSBAcGVyY2VudGFnZXMgPSAoKTsKIAlm
b3IgKEB2YWxzMikKIAl7CkBAIC00MjEsNyArNDQ0LDcgQEAKIAkkdGV4dCAuPSBxcSMgICAg
PHRkIGNsYXNzPSJibGFuayIkYWdnX2NvbHVtbl93aWR0aD4mbmJzcDs8L3RkPlxuIwogCS4J
cXEjICA8L3RyPlxuIwogCS4JcXEjICA8dHI+XG4jCi0JLglxcSMgICAgPHRoIGNvbHNwYW49
IjIiPlBlcmNlbnQ8L3RoPlxuIzsKKwkuCXFxIyAgICA8dGggY29sc3Bhbj0iIy4oJHNraXBf
ZW1wdHkgPyAxIDogMikucXEjIj5QZXJjZW50PC90aD5cbiM7CiAJJHRleHQgLj0gcXEjICAg
IDx0ZCBjbGFzcz0idG90YWwiPiRfPC90ZD5cbiMgZm9yIChAcGVyY2VudGFnZXMpOwogCSR0
ZXh0IC49IHFxIyAgICA8dGQgY2xhc3M9ImJsYW5rIiBjb2xzcGFuPSIjIC4gKDIgKiAkbnVt
X2FnZ3MpIC4gcXEjIj4mbmJzcDs8L3RkPlxuIwogCS4JcXEjICA8L3RyPlxuIwo=
------------FCD7CC2BF7578--