From e7b28e3a7f9fa606050ae04a64231ffb84cd773c Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Sun, 25 Apr 2021 22:34:01 +0200 Subject: [PATCH 1/3] base: Use question variable for single choice and limit overrides Before singlechoice boxes would require both their own variable and the value to override. As singlechoice boxes now simply use the variable of their surrounding questions, it is sane to just only match against variable + value. TODO: This works now, but the whole thing of passing both variable and value at the same time (and putting it into the metadata) is maybe a bit odd? --- sdapsbase.dtx | 73 ++++++------- sphinx/sdapsbase.rst | 26 ++--- testfiles/base.lvt | 9 +- testfiles/base.tlg | 14 +-- testfiles/base.xetex.tlg | 10 +- testfiles/classic.tlg | 148 +++++++++++++------------- testfiles/classic.xetex.tlg | 148 +++++++++++++------------- testfiles/layout.tlg | 206 ++++++++++++++++++------------------ testfiles/layout.xetex.tlg | 206 ++++++++++++++++++------------------ 9 files changed, 411 insertions(+), 429 deletions(-) diff --git a/sdapsbase.dtx b/sdapsbase.dtx index 93fed78..c8f77c5 100644 --- a/sdapsbase.dtx +++ b/sdapsbase.dtx @@ -603,6 +603,24 @@ \tl_set:NV #2 \l__sdaps_tmpa_tl } +\cs_new_protected_nopar:Nn \_sdaps_get_var:N +{ + \sdaps_context_get:nN { _implicit_var } \l__sdaps_tmpa_tl + \tl_if_eq:VnTF \l__sdaps_tmpa_tl { \q_no_value } { + % Just return the current variable + \sdaps_context_get:nN { _var } #1 + } { + % Prepend explicit variable name + \sdaps_context_get:nN { _var } \l__sdaps_tmpb_tl + \tl_if_eq:VnF \l__sdaps_tmpb_tl { \q_no_value } { + \tl_put_left:Nn \l__sdaps_tmpa_tl { _ } + \tl_put_left:NV \l__sdaps_tmpa_tl \l__sdaps_tmpb_tl + } + + \tl_set:NV #1 \l__sdaps_tmpa_tl + } +} + \cs_new_protected_nopar:Nn \_sdaps_box_inc_object_id: { \bool_if:NT \g_sdaps_write_enable_bool { @@ -685,52 +703,23 @@ \cs_generate_variant:Nn \sdaps_set_questionnaire_id:n { V } -\cs_new_protected_nopar:Nn \__sdaps_append_override_options:Nnn +\cs_new_protected_nopar:Nn \__sdaps_append_override_options:Nn { - % Global definition - % First generic for all items - \prop_get:NnNT \g__sdaps_overrides_prop { * } \l__sdaps_tmpa_tl { - \tl_put_right:Nn #1 {,} - \tl_put_right:NV #1 \l__sdaps_tmpa_tl - } \tl_if_empty:nF { #2 } { - % Items with same variable name + % Global (non-questionnaire ID specific) definition \prop_get:NnNT \g__sdaps_overrides_prop { #2 } \l__sdaps_tmpa_tl { \tl_put_right:Nn #1 {,} \tl_put_right:NV #1 \l__sdaps_tmpa_tl } - \tl_if_empty:nF { #3 } { - % Items with same variable name and value - \prop_get:NnNT \g__sdaps_overrides_prop { #2 } \l__sdaps_tmpa_tl { - \tl_put_right:Nn #1 {,} - \tl_put_right:NV #1 \l__sdaps_tmpa_tl - } - } - } - - % Local (questionnaire ID specific) definition - % First generic for all items - \prop_get:NnNT \g__sdaps_id_overrides_prop { * } \l__sdaps_tmpa_tl { - \tl_put_right:Nn #1 {,} - \tl_put_right:NV #1 \l__sdaps_tmpa_tl - } - \tl_if_empty:nF { #2 } { - % Items with same variable name + % Local (questionnaire ID specific) definition \prop_get:NnNT \g__sdaps_id_overrides_prop { #2 } \l__sdaps_tmpa_tl { \tl_put_right:Nn #1 {,} \tl_put_right:NV #1 \l__sdaps_tmpa_tl } - \tl_if_empty:nF { #3 } { - % Items with same variable name and value - \prop_get:NnNT \g__sdaps_id_overrides_prop { #2 } \l__sdaps_tmpa_tl { - \tl_put_right:Nn #1 {,} - \tl_put_right:NV #1 \l__sdaps_tmpa_tl - } - } } } -\cs_generate_variant:Nn \__sdaps_append_override_options:Nnn { NVn } +\cs_generate_variant:Nn \__sdaps_append_override_options:Nn { NV } % \end{macrocode} % @@ -749,6 +738,7 @@ \int_set:Nn \g__sdaps_textbox_num_int 0 \tl_new:N \l_sdaps_var_tl +\tl_new:N \l_sdaps_boxtype_tl \dim_new:N \l_sdaps_x_dim \dim_new:N \l_sdaps_y_dim \dim_new:N \l_sdaps_width_dim @@ -934,18 +924,21 @@ { \group_begin:% - \_sdaps_generate_var:nN { #1 } \l_sdaps_var_tl - - \sdaps_context_get:nN { checkboxtype } \l__sdaps_tmpa_tl - \tl_if_eq:VnTF \l__sdaps_tmpa_tl { multichoice } { + \sdaps_context_get:nN { checkboxtype } \l_sdaps_boxtype_tl + \tl_if_eq:VnTF \l_sdaps_boxtype_tl { multichoice } { + \_sdaps_generate_var:nN { #1 } \l_sdaps_var_tl \tl_set:Nn \l_sdaps_parse_unknown_tl { box } + \tl_set:Nx \l__sdaps_tmpa_tl { \l_sdaps_var_tl } } { + \_sdaps_get_var:N \l_sdaps_var_tl \tl_set:Nn \l_sdaps_parse_unknown_tl { ellipse } + %\tl_set:Nx \l__sdaps_tmpa_tl { \l_sdaps_var_tl } + \tl_set:Nx \l__sdaps_tmpa_tl { \l_sdaps_var_tl } } \__sdaps_append_from_context:nN { * } \l_sdaps_parse_unknown_tl - \__sdaps_append_from_context:VN \l__sdaps_tmpa_tl \l_sdaps_parse_unknown_tl - \__sdaps_append_override_options:NVn \l_sdaps_parse_unknown_tl \l_sdaps_var_tl { #2 } + \__sdaps_append_from_context:VN \l_sdaps_boxtype_tl \l_sdaps_parse_unknown_tl + \__sdaps_append_override_options:NV \l_sdaps_parse_unknown_tl \l__sdaps_tmpa_tl \keys_set_known:nVN { sdaps / checkbox } \l_sdaps_parse_unknown_tl \l_sdaps_parse_unknown_tl @@ -1074,7 +1067,7 @@ \__sdaps_append_from_context:nN { * } \l_sdaps_parse_unknown_tl \__sdaps_append_from_context:VN \l__sdaps_tmpa_tl \l_sdaps_parse_unknown_tl - \__sdaps_append_override_options:NVn \l_sdaps_parse_unknown_tl \l_sdaps_var_tl { } + \__sdaps_append_override_options:NV \l_sdaps_parse_unknown_tl \l_sdaps_var_tl \keys_set_known:nVN { sdaps / textbox } \l_sdaps_parse_unknown_tl \l_sdaps_parse_unknown_tl diff --git a/sphinx/sdapsbase.rst b/sphinx/sdapsbase.rst index 218f5d0..1a76f28 100644 --- a/sphinx/sdapsbase.rst +++ b/sphinx/sdapsbase.rst @@ -233,20 +233,11 @@ There is only one command to set the overrides string: :arg overrides: A key=value argument with all the override definitions. - Each of the override definitions will be appened to the items keys if it is - matching. Matching happens first based on the questionnaire ID with ``*`` - being allowed as a wildcard, and then based on variable name and value. The - second level (name and value) is either just the variable name or the variable - name and value separated by an ``&`` character. - - This gives six matches with increasing priority: - - * wildcard questionnaire ID, wildcard target - * wildcard questionnaire ID, matching variable - * wildcard questionnaire ID, matching variable, matching value - * matching questionnaire ID, wildcard target - * matching questionnaire ID, matching variable - * matching questionnaire ID, matching variable, matching value + This only allows overriding a specific box based on the questoinnaire it is + on. On the first level, a match against the questionnaire ID happens + (or `*`). For single choice boxes, the boxes are addressed by using the + question variable and value separated by `&`. Otherwise they are addressed + using the variable only. .. sdaps:: Overriding checkbox color and pre-filled value based on questionnaire ID and variables. @@ -257,12 +248,11 @@ There is only one command to set the overrides string: \sdaps_overrides_init:n{ % For all questoinnaires independent of their ID *={ - % For all elements which use the overrides - *={fill=green}, % Specific element with that variable name flower_bob_alice={draw_check=true}, - % Specific element with variable "var" and value 1 - var&1={draw_check=true}, + + % If we had a single choice (option) question: + variable&1={draw_check=true}, }, % Specific questionnaire ID testid={ diff --git a/testfiles/base.lvt b/testfiles/base.lvt index d236470..223c465 100644 --- a/testfiles/base.lvt +++ b/testfiles/base.lvt @@ -88,24 +88,21 @@ \ExplSyntaxOn \sdaps_overrides_init:n{ *={ - *={}, var1={}, var2&val1={}, }, qid1={ - *={}, var1={}, var2&val1={}, }, testoverrideqid={ - *={height=5mm}, testvar={height=10mm}, 3_testvar={height=12.5mm}, - testvar&testval={height=15mm}, + 3&testval={height=15mm}, prefix_1={height=7mm}, prefix_testvar={height=10mm}, - prefix_testvar&testval={height=15mm}, + prefix&testval={height=15mm}, }, } \ExplSyntaxOff @@ -190,6 +187,7 @@ \sdaps_checkbox:nn { _testvar } {} {}~ + \sdaps_context_set:n { checkboxtype=singlechoice } \sdaps_checkbox:nn { testvar } { testval } {} } @@ -205,6 +203,7 @@ \sdaps_checkbox:nn { _testvar } {} {}~ + \sdaps_context_set:n { checkboxtype=singlechoice } \sdaps_checkbox:nn { testvar } { testval } {} } diff --git a/testfiles/base.tlg b/testfiles/base.tlg index 98f2eaa..5eea780 100644 --- a/testfiles/base.tlg +++ b/testfiles/base.tlg @@ -53,16 +53,16 @@ encoded: \startC ,32,49,89,23,00,03,97,\stop , black-white: 21123223212121133121214131213121222212122341111323311120 [3 [14]QObject-Choice=3. A choice question -[15]Box[3]=Checkbox,3,89.62619pt,746.31589pt,9.95845pt,14.22636pt,box,1.00374pt,3_1,1 +[15]Box[3]=Checkbox,3,89.62619pt,744.18193pt,9.95845pt,9.95845pt,box,1.00374pt,3_1,1 [16]Box[3]=Checkbox,3,103.23462pt,753.42908pt,9.95845pt,28.45274pt,box,1.00374pt,testvar,2 [17]Box[3]=Checkbox,3,116.84305pt,756.98567pt,9.95845pt,35.56593pt,box,1.00374pt,3_testvar,3 -[18]Box[3]=Checkbox,3,130.45148pt,760.54227pt,9.95845pt,42.67912pt,box,1.00374pt,testvar,testval +[18]Box[3]=Checkbox,3,130.45148pt,760.54227pt,9.95845pt,42.67912pt,ellipse,1.00374pt,3,testval [19]Variable[3]=3 [20]QObject-Choice=4. A choice question [21]Box[4]=Checkbox,3,89.62619pt,705.48206pt,9.95845pt,19.91692pt,box,1.00374pt,prefix_1,1 [22]Box[4]=Checkbox,3,103.23462pt,709.74997pt,9.95845pt,28.45274pt,box,1.00374pt,prefix_testvar,2 [23]Box[4]=Checkbox,3,116.84305pt,709.74997pt,9.95845pt,28.45274pt,box,1.00374pt,prefix_testvar,3 -[24]Box[4]=Checkbox,3,130.45148pt,716.86316pt,9.95845pt,42.67912pt,box,1.00374pt,prefix_testvar,testval +[24]Box[4]=Checkbox,3,130.45148pt,716.86316pt,9.95845pt,42.67912pt,ellipse,1.00374pt,prefix,testval [25]Variable[4]=prefix [26]Pages=3 ] @@ -153,12 +153,12 @@ black-white: 21123223212121133121214131213121222212231222321123311120 [64]QObject-Choice=8. A choice question [65]Box[8]=Checkbox,7,89.62619pt,758.29315pt,9.95845pt,9.95845pt,box,1.00374pt,8_1,1 [66]Box[8]=Checkbox,7,99.58463pt,758.29315pt,9.95845pt,9.95845pt,box,2.00749pt,8_2,2 -[67]Box[8]=Checkbox,7,89.62619pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,8_3,3 -[68]Box[8]=Checkbox,7,99.58463pt,744.69315pt,9.95845pt,9.95845pt,ellipse,2.00749pt,8_4,4 +[67]Box[8]=Checkbox,7,89.62619pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,8,3 +[68]Box[8]=Checkbox,7,99.58463pt,744.69315pt,9.95845pt,9.95845pt,ellipse,2.00749pt,8,4 [69]Box[8]=Checkbox,7,89.62619pt,731.09314pt,9.95845pt,9.95845pt,box,1.00374pt,8_5,5 [70]Box[8]=Checkbox,7,99.58463pt,731.09314pt,9.95845pt,9.95845pt,box,1.00374pt,8_6,6 -[71]Box[8]=Checkbox,7,89.62619pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,8_7,7 -[72]Box[8]=Checkbox,7,99.58463pt,717.49313pt,9.95845pt,9.95845pt,ellipse,2.00749pt,8_8,8 +[71]Box[8]=Checkbox,7,89.62619pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,8,7 +[72]Box[8]=Checkbox,7,99.58463pt,717.49313pt,9.95845pt,9.95845pt,ellipse,2.00749pt,8,8 [73]Variable[8]=8 [74]Pages=7 ] diff --git a/testfiles/base.xetex.tlg b/testfiles/base.xetex.tlg index 2da34b6..edb304d 100644 --- a/testfiles/base.xetex.tlg +++ b/testfiles/base.xetex.tlg @@ -53,7 +53,7 @@ encoded: \startC ,32,49,89,23,00,03,97,\stop , black-white: 21123223212121133121214131213121222212122341111323311120 [3 [14]QObject-Choice=3. A choice question -[15]Box[3]=Checkbox,3,89.62619pt,746.31589pt,9.95845pt,14.22636pt,box,1.00374pt,3_1,1 +[15]Box[3]=Checkbox,3,89.62619pt,744.18193pt,9.95845pt,9.95845pt,box,1.00374pt,3_1,1 [16]Box[3]=Checkbox,3,103.23097pt,753.42908pt,9.95845pt,28.45274pt,box,1.00374pt,testvar,2 [17]Box[3]=Checkbox,3,116.83575pt,756.98567pt,9.95845pt,35.56593pt,box,1.00374pt,3_testvar,3 [18]Box[3]=Checkbox,3,130.44054pt,760.54227pt,9.95845pt,42.67912pt,box,1.00374pt,testvar,testval @@ -153,12 +153,12 @@ black-white: 21123223212121133121214131213121222212231222321123311120 [64]QObject-Choice=8. A choice question [65]Box[8]=Checkbox,7,89.62619pt,758.29706pt,9.95845pt,9.95845pt,box,1.00374pt,8_1,1 [66]Box[8]=Checkbox,7,99.58463pt,758.29706pt,9.95845pt,9.95845pt,box,2.00749pt,8_2,2 -[67]Box[8]=Checkbox,7,89.62619pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,8_3,3 -[68]Box[8]=Checkbox,7,99.58463pt,744.69705pt,9.95845pt,9.95845pt,ellipse,2.00749pt,8_4,4 +[67]Box[8]=Checkbox,7,89.62619pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,8,3 +[68]Box[8]=Checkbox,7,99.58463pt,744.69705pt,9.95845pt,9.95845pt,ellipse,2.00749pt,8,4 [69]Box[8]=Checkbox,7,89.62619pt,731.09705pt,9.95845pt,9.95845pt,box,1.00374pt,8_5,5 [70]Box[8]=Checkbox,7,99.58463pt,731.09705pt,9.95845pt,9.95845pt,box,1.00374pt,8_6,6 -[71]Box[8]=Checkbox,7,89.62619pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,8_7,7 -[72]Box[8]=Checkbox,7,99.58463pt,717.49704pt,9.95845pt,9.95845pt,ellipse,2.00749pt,8_8,8 +[71]Box[8]=Checkbox,7,89.62619pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,8,7 +[72]Box[8]=Checkbox,7,99.58463pt,717.49704pt,9.95845pt,9.95845pt,ellipse,2.00749pt,8,8 [73]Variable[8]=8 [74]Pages=7 ] diff --git a/testfiles/classic.tlg b/testfiles/classic.tlg index 7d2ad2b..0985a4d 100644 --- a/testfiles/classic.tlg +++ b/testfiles/classic.tlg @@ -20,35 +20,35 @@ Package hyperref Warning: Token not allowed in a PDF string (PDFDocEncoding): [13]QObject-range=0.1. question [14]Range-lower[0.1]=0,lower [15]Range-upper[0.1]=4,upper -[26]Box[0.1]=Checkbox,0,249.85786pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_1,1 -[27]Box[0.1]=Checkbox,0,271.81631pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_2,2 -[28]Box[0.1]=Checkbox,0,293.77477pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_3,3 -[29]Box[0.1]=Checkbox,0,315.73322pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_4,4 -[30]Box[0.1]=Checkbox,0,337.69167pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_5,5 +[26]Box[0.1]=Checkbox,0,249.85786pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,1 +[27]Box[0.1]=Checkbox,0,271.81631pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,2 +[28]Box[0.1]=Checkbox,0,293.77477pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,3 +[29]Box[0.1]=Checkbox,0,315.73322pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,4 +[30]Box[0.1]=Checkbox,0,337.69167pt,762.1402pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,5 [31]Variable[0.1]=0_1 [32]QObject-range=0.2. question [33]Range-lower[0.2]=0,lower [34]Range-upper[0.2]=6,upper -[49]Box[0.2]=Checkbox,0,227.89941pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_1,1 -[50]Box[0.2]=Checkbox,0,249.85786pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_2,2 -[51]Box[0.2]=Checkbox,0,271.81631pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_3,3 -[52]Box[0.2]=Checkbox,0,293.77477pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_4,4 -[53]Box[0.2]=Checkbox,0,315.73322pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_5,5 -[54]Box[0.2]=Checkbox,0,337.69167pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_6,6 -[55]Box[0.2]=Checkbox,0,359.65012pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_7,7 +[49]Box[0.2]=Checkbox,0,227.89941pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,1 +[50]Box[0.2]=Checkbox,0,249.85786pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,2 +[51]Box[0.2]=Checkbox,0,271.81631pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,3 +[52]Box[0.2]=Checkbox,0,293.77477pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,4 +[53]Box[0.2]=Checkbox,0,315.73322pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,5 +[54]Box[0.2]=Checkbox,0,337.69167pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,6 +[55]Box[0.2]=Checkbox,0,359.65012pt,722.13914pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,7 [56]Variable[0.2]=0_2 [57]QObject-range=0.3. question [58]Range-lower[0.3]=0,lower [59]Range-upper[0.3]=6,upper [60]Answer[0.3]=other -[77]Box[0.3]=Checkbox,0,165.31404pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_1,1 -[78]Box[0.3]=Checkbox,0,187.27249pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_2,2 -[79]Box[0.3]=Checkbox,0,209.23094pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_3,3 -[80]Box[0.3]=Checkbox,0,231.18939pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_4,4 -[81]Box[0.3]=Checkbox,0,253.14784pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_5,5 -[82]Box[0.3]=Checkbox,0,275.1063pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_6,6 -[83]Box[0.3]=Checkbox,0,297.06474pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_7,7 -[84]Box[0.3]=Checkbox,0,444.19391pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_0,0 +[77]Box[0.3]=Checkbox,0,165.31404pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,1 +[78]Box[0.3]=Checkbox,0,187.27249pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,2 +[79]Box[0.3]=Checkbox,0,209.23094pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,3 +[80]Box[0.3]=Checkbox,0,231.18939pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,4 +[81]Box[0.3]=Checkbox,0,253.14784pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,5 +[82]Box[0.3]=Checkbox,0,275.1063pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,6 +[83]Box[0.3]=Checkbox,0,297.06474pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,7 +[84]Box[0.3]=Checkbox,0,444.19391pt,682.13809pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,0 [85]Variable[0.3]=0_3 ] ============================================================ @@ -83,10 +83,10 @@ Package hyperref Warning: Token not allowed in a PDF string (PDFDocEncoding): [99]Answer[0.5]=btext [101]Answer[0.5]=ctext [103]Answer[0.5]=ctext -[98]Box[0.5]=Checkbox,0,40.1433pt,645.68501pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar_1,1 -[100]Box[0.5]=Checkbox,0,116.41968pt,645.68501pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar_2,10 -[102]Box[0.5]=Checkbox,0,192.69606pt,645.68501pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar_3,3 -[104]Box[0.5]=Checkbox,0,40.1433pt,632.085pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar_4,4 +[98]Box[0.5]=Checkbox,0,40.1433pt,645.68501pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar,1 +[100]Box[0.5]=Checkbox,0,116.41968pt,645.68501pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar,10 +[102]Box[0.5]=Checkbox,0,192.69606pt,645.68501pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar,3 +[104]Box[0.5]=Checkbox,0,40.1433pt,632.085pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar,4 [105]Variable[0.5]=qvar [106]QObject-Choice=0.6. Question [107]Answer[0.6]=a \newline a @@ -208,28 +208,28 @@ Package hyperref Warning: Token not allowed in a PDF string (PDFDocEncoding): [187]QObject-Option=0.10.1. qa [188]Answer[0.10.1]=a [189]Answer[0.10.1]=b -[190]Box[0.10.1]=Checkbox,0,525.44777pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_1_1,1 -[191]Box[0.10.1]=Checkbox,0,547.4062pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_1_2,2 +[190]Box[0.10.1]=Checkbox,0,525.44777pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_1,1 +[191]Box[0.10.1]=Checkbox,0,547.4062pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_1,2 [192]Variable[0.10.1]=0_10_1 [193]QObject-Option=0.10.2. qb [194]Answer[0.10.2]=a [195]Answer[0.10.2]=b -[196]Box[0.10.2]=Checkbox,0,525.44777pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_2_1,1 -[197]Box[0.10.2]=Checkbox,0,547.4062pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_2_2,2 +[196]Box[0.10.2]=Checkbox,0,525.44777pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_2,1 +[197]Box[0.10.2]=Checkbox,0,547.4062pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_2,2 [198]Variable[0.10.2]=0_10_2 [199]Variable[0.10]=0_10 [200]QObject-Head=0.11. Metadata Header [201]QObject-Option=0.11.1. qa [202]Answer[0.11.1]=a [203]Answer[0.11.1]=b -[204]Box[0.11.1]=Checkbox,0,525.44777pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_1_1,1 -[205]Box[0.11.1]=Checkbox,0,547.4062pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_1_2,2 +[204]Box[0.11.1]=Checkbox,0,525.44777pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_1,1 +[205]Box[0.11.1]=Checkbox,0,547.4062pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_1,2 [206]Variable[0.11.1]=0_11_1 [207]QObject-Option=0.11.2. qb [208]Answer[0.11.2]=a [209]Answer[0.11.2]=b -[210]Box[0.11.2]=Checkbox,0,525.44777pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_2_1,1 -[211]Box[0.11.2]=Checkbox,0,547.4062pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_2_2,2 +[210]Box[0.11.2]=Checkbox,0,525.44777pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_2,1 +[211]Box[0.11.2]=Checkbox,0,547.4062pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_2,2 [212]Variable[0.11.2]=0_11_2 [213]Variable[0.11]=0_11 [214]QObject-Head=0.12. Header @@ -237,25 +237,25 @@ Package hyperref Warning: Token not allowed in a PDF string (PDFDocEncoding): [216]Answer[0.12.1]=a [217]Answer[0.12.1]=b [218]Answer[0.12.1]=c -[219]Box[0.12.1]=Checkbox,0,503.48933pt,631.31331pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1_1,1 -[220]Box[0.12.1]=Checkbox,0,525.44777pt,631.31331pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1_b,2 -[221]Box[0.12.1]=Checkbox,0,547.4062pt,631.31331pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1_3,3 +[219]Box[0.12.1]=Checkbox,0,503.48933pt,631.31331pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1,1 +[220]Box[0.12.1]=Checkbox,0,525.44777pt,631.31331pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1,2 +[221]Box[0.12.1]=Checkbox,0,547.4062pt,631.31331pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1,3 [222]Variable[0.12.1]=test_1 [223]QObject-Option=0.12.2. qb [224]Answer[0.12.2]=a [225]Answer[0.12.2]=b [226]Answer[0.12.2]=c -[227]Box[0.12.2]=Checkbox,0,503.48933pt,617.7133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b_1,1 -[228]Box[0.12.2]=Checkbox,0,525.44777pt,617.7133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b_b,2 -[229]Box[0.12.2]=Checkbox,0,547.4062pt,617.7133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b_3,3 +[227]Box[0.12.2]=Checkbox,0,503.48933pt,617.7133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b,1 +[228]Box[0.12.2]=Checkbox,0,525.44777pt,617.7133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b,2 +[229]Box[0.12.2]=Checkbox,0,547.4062pt,617.7133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b,3 [230]Variable[0.12.2]=test_b [231]QObject-Option=0.12.3. qc [232]Answer[0.12.3]=a [233]Answer[0.12.3]=b [234]Answer[0.12.3]=c -[235]Box[0.12.3]=Checkbox,0,503.48933pt,604.1133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3_1,1 -[236]Box[0.12.3]=Checkbox,0,525.44777pt,604.1133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3_b,2 -[237]Box[0.12.3]=Checkbox,0,547.4062pt,604.1133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3_3,3 +[235]Box[0.12.3]=Checkbox,0,503.48933pt,604.1133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3,1 +[236]Box[0.12.3]=Checkbox,0,525.44777pt,604.1133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3,2 +[237]Box[0.12.3]=Checkbox,0,547.4062pt,604.1133pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3,3 [238]Variable[0.12.3]=test_3 [239]Variable[0.12]=test ] @@ -275,65 +275,65 @@ Package hyperref Warning: Token not allowed in a PDF string (PDFDocEncoding): [240]QObject-Head=0.13. Inline Header [241]QObject-Range=0.13.1. a [242]Range-lower[0.13.1]=0,lower -[243]Box[0.13.1]=Checkbox,0,424.49905pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_1,1 -[244]Box[0.13.1]=Checkbox,0,445.34537pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_2,2 -[245]Box[0.13.1]=Checkbox,0,466.19168pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_3,3 -[246]Box[0.13.1]=Checkbox,0,487.038pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_4,4 -[247]Box[0.13.1]=Checkbox,0,507.88431pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_5,5 +[243]Box[0.13.1]=Checkbox,0,424.49905pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,1 +[244]Box[0.13.1]=Checkbox,0,445.34537pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,2 +[245]Box[0.13.1]=Checkbox,0,466.19168pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,3 +[246]Box[0.13.1]=Checkbox,0,487.038pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,4 +[247]Box[0.13.1]=Checkbox,0,507.88431pt,767.85359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,5 [248]Range-upper[0.13.1]=4,upper [249]Variable[0.13.1]=0_13_1 [250]QObject-Range=0.13.2. b [251]Range-lower[0.13.2]=0,lower -[252]Box[0.13.2]=Checkbox,0,424.49905pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_1,1 -[253]Box[0.13.2]=Checkbox,0,445.34537pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_2,2 -[254]Box[0.13.2]=Checkbox,0,466.19168pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_3,3 -[255]Box[0.13.2]=Checkbox,0,487.038pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_4,4 -[256]Box[0.13.2]=Checkbox,0,507.88431pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_5,5 +[252]Box[0.13.2]=Checkbox,0,424.49905pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,1 +[253]Box[0.13.2]=Checkbox,0,445.34537pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,2 +[254]Box[0.13.2]=Checkbox,0,466.19168pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,3 +[255]Box[0.13.2]=Checkbox,0,487.038pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,4 +[256]Box[0.13.2]=Checkbox,0,507.88431pt,754.25359pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,5 [257]Range-upper[0.13.2]=4,upper [258]Variable[0.13.2]=0_13_2 [259]QObject-Range=0.13.3. c [260]Range-lower[0.13.3]=0,l -[261]Box[0.13.3]=Checkbox,0,424.49905pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_1,1 -[262]Box[0.13.3]=Checkbox,0,445.34537pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_2,2 -[263]Box[0.13.3]=Checkbox,0,466.19168pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_3,3 -[264]Box[0.13.3]=Checkbox,0,487.038pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_4,4 -[265]Box[0.13.3]=Checkbox,0,507.88431pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_5,5 +[261]Box[0.13.3]=Checkbox,0,424.49905pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,1 +[262]Box[0.13.3]=Checkbox,0,445.34537pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,2 +[263]Box[0.13.3]=Checkbox,0,466.19168pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,3 +[264]Box[0.13.3]=Checkbox,0,487.038pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,4 +[265]Box[0.13.3]=Checkbox,0,507.88431pt,740.65358pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,5 [266]Range-upper[0.13.3]=4,u [267]Variable[0.13.3]=0_13_3 [268]Variable[0.13]=0_13 [269]QObject-Head=0.14. Inline Header [270]QObject-Range=0.14.1. a [271]Range-lower[0.14.1]=0,lower -[272]Box[0.14.1]=Checkbox,0,362.10823pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_1,1 -[273]Box[0.14.1]=Checkbox,0,382.95454pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_2,2 -[274]Box[0.14.1]=Checkbox,0,403.80086pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_3,3 -[275]Box[0.14.1]=Checkbox,0,424.64717pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_4,4 -[276]Box[0.14.1]=Checkbox,0,445.49348pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_5,5 +[272]Box[0.14.1]=Checkbox,0,362.10823pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,1 +[273]Box[0.14.1]=Checkbox,0,382.95454pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,2 +[274]Box[0.14.1]=Checkbox,0,403.80086pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,3 +[275]Box[0.14.1]=Checkbox,0,424.64717pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,4 +[276]Box[0.14.1]=Checkbox,0,445.49348pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,5 [277]Range-upper[0.14.1]=4,upper [278]Answer[0.14.1]=other -[279]Box[0.14.1]=Checkbox,0,518.97382pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_6,0 +[279]Box[0.14.1]=Checkbox,0,518.97382pt,706.38345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,0 [280]Variable[0.14.1]=a_1 [281]QObject-Range=0.14.2. b [282]Range-lower[0.14.2]=0,lower -[283]Box[0.14.2]=Checkbox,0,362.10823pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_1,1 -[284]Box[0.14.2]=Checkbox,0,382.95454pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_2,2 -[285]Box[0.14.2]=Checkbox,0,403.80086pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_3,3 -[286]Box[0.14.2]=Checkbox,0,424.64717pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_4,4 -[287]Box[0.14.2]=Checkbox,0,445.49348pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_5,5 +[283]Box[0.14.2]=Checkbox,0,362.10823pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,1 +[284]Box[0.14.2]=Checkbox,0,382.95454pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,2 +[285]Box[0.14.2]=Checkbox,0,403.80086pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,3 +[286]Box[0.14.2]=Checkbox,0,424.64717pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,4 +[287]Box[0.14.2]=Checkbox,0,445.49348pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,5 [288]Range-upper[0.14.2]=4,upper [289]Answer[0.14.2]=other -[290]Box[0.14.2]=Checkbox,0,518.97382pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_6,0 +[290]Box[0.14.2]=Checkbox,0,518.97382pt,692.78345pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,0 [291]Variable[0.14.2]=a_b [292]QObject-Range=0.14.3. c [293]Range-lower[0.14.3]=0,l -[294]Box[0.14.3]=Checkbox,0,362.10823pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_1,1 -[295]Box[0.14.3]=Checkbox,0,382.95454pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_2,2 -[296]Box[0.14.3]=Checkbox,0,403.80086pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_3,3 -[297]Box[0.14.3]=Checkbox,0,424.64717pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_4,4 -[298]Box[0.14.3]=Checkbox,0,445.49348pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_5,5 +[294]Box[0.14.3]=Checkbox,0,362.10823pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,1 +[295]Box[0.14.3]=Checkbox,0,382.95454pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,2 +[296]Box[0.14.3]=Checkbox,0,403.80086pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,3 +[297]Box[0.14.3]=Checkbox,0,424.64717pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,4 +[298]Box[0.14.3]=Checkbox,0,445.49348pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,5 [299]Range-upper[0.14.3]=4,u [300]Answer[0.14.3]=other -[301]Box[0.14.3]=Checkbox,0,518.97382pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_6,0 +[301]Box[0.14.3]=Checkbox,0,518.97382pt,679.18344pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,0 [302]Variable[0.14.3]=a_3 [303]Variable[0.14]=a ] diff --git a/testfiles/classic.xetex.tlg b/testfiles/classic.xetex.tlg index 4aad38a..d56b75e 100644 --- a/testfiles/classic.xetex.tlg +++ b/testfiles/classic.xetex.tlg @@ -20,35 +20,35 @@ Package hyperref Warning: Token not allowed in a PDF string (Unicode): [13]QObject-range=0.1. question [14]Range-lower[0.1]=0,lower [15]Range-upper[0.1]=4,upper -[26]Box[0.1]=Checkbox,0,249.85786pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_1,1 -[27]Box[0.1]=Checkbox,0,271.81631pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_2,2 -[28]Box[0.1]=Checkbox,0,293.77477pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_3,3 -[29]Box[0.1]=Checkbox,0,315.73322pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_4,4 -[30]Box[0.1]=Checkbox,0,337.69167pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1_5,5 +[26]Box[0.1]=Checkbox,0,249.85786pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,1 +[27]Box[0.1]=Checkbox,0,271.81631pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,2 +[28]Box[0.1]=Checkbox,0,293.77477pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,3 +[29]Box[0.1]=Checkbox,0,315.73322pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,4 +[30]Box[0.1]=Checkbox,0,337.69167pt,762.13997pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_1,5 [31]Variable[0.1]=0_1 [32]QObject-range=0.2. question [33]Range-lower[0.2]=0,lower [34]Range-upper[0.2]=6,upper -[49]Box[0.2]=Checkbox,0,227.89941pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_1,1 -[50]Box[0.2]=Checkbox,0,249.85786pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_2,2 -[51]Box[0.2]=Checkbox,0,271.81631pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_3,3 -[52]Box[0.2]=Checkbox,0,293.77477pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_4,4 -[53]Box[0.2]=Checkbox,0,315.73322pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_5,5 -[54]Box[0.2]=Checkbox,0,337.69167pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_6,6 -[55]Box[0.2]=Checkbox,0,359.65012pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2_7,7 +[49]Box[0.2]=Checkbox,0,227.89941pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,1 +[50]Box[0.2]=Checkbox,0,249.85786pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,2 +[51]Box[0.2]=Checkbox,0,271.81631pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,3 +[52]Box[0.2]=Checkbox,0,293.77477pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,4 +[53]Box[0.2]=Checkbox,0,315.73322pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,5 +[54]Box[0.2]=Checkbox,0,337.69167pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,6 +[55]Box[0.2]=Checkbox,0,359.65012pt,722.13617pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_2,7 [56]Variable[0.2]=0_2 [57]QObject-range=0.3. question [58]Range-lower[0.3]=0,lower [59]Range-upper[0.3]=6,upper [60]Answer[0.3]=other -[77]Box[0.3]=Checkbox,0,165.31404pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_1,1 -[78]Box[0.3]=Checkbox,0,187.27249pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_2,2 -[79]Box[0.3]=Checkbox,0,209.23094pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_3,3 -[80]Box[0.3]=Checkbox,0,231.18939pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_4,4 -[81]Box[0.3]=Checkbox,0,253.14784pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_5,5 -[82]Box[0.3]=Checkbox,0,275.1063pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_6,6 -[83]Box[0.3]=Checkbox,0,297.06474pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_7,7 -[84]Box[0.3]=Checkbox,0,444.19391pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3_0,0 +[77]Box[0.3]=Checkbox,0,165.31404pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,1 +[78]Box[0.3]=Checkbox,0,187.27249pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,2 +[79]Box[0.3]=Checkbox,0,209.23094pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,3 +[80]Box[0.3]=Checkbox,0,231.18939pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,4 +[81]Box[0.3]=Checkbox,0,253.14784pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,5 +[82]Box[0.3]=Checkbox,0,275.1063pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,6 +[83]Box[0.3]=Checkbox,0,297.06474pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,7 +[84]Box[0.3]=Checkbox,0,444.19391pt,682.13237pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_3,0 [85]Variable[0.3]=0_3 ] ============================================================ @@ -83,10 +83,10 @@ Package hyperref Warning: Token not allowed in a PDF string (Unicode): [99]Answer[0.5]=btext [101]Answer[0.5]=ctext [103]Answer[0.5]=ctext -[98]Box[0.5]=Checkbox,0,40.1433pt,645.68094pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar_1,1 -[100]Box[0.5]=Checkbox,0,116.41985pt,645.68094pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar_2,10 -[102]Box[0.5]=Checkbox,0,192.6964pt,645.68094pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar_3,3 -[104]Box[0.5]=Checkbox,0,40.1433pt,632.08093pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar_4,4 +[98]Box[0.5]=Checkbox,0,40.1433pt,645.68094pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar,1 +[100]Box[0.5]=Checkbox,0,116.41985pt,645.68094pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar,10 +[102]Box[0.5]=Checkbox,0,192.6964pt,645.68094pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar,3 +[104]Box[0.5]=Checkbox,0,40.1433pt,632.08093pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qvar,4 [105]Variable[0.5]=qvar [106]QObject-Choice=0.6. Question [107]Answer[0.6]=a \newline a @@ -208,28 +208,28 @@ Package hyperref Warning: Token not allowed in a PDF string (Unicode): [187]QObject-Option=0.10.1. qa [188]Answer[0.10.1]=a [189]Answer[0.10.1]=b -[190]Box[0.10.1]=Checkbox,0,525.44777pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_1_1,1 -[191]Box[0.10.1]=Checkbox,0,547.4062pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_1_2,2 +[190]Box[0.10.1]=Checkbox,0,525.44777pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_1,1 +[191]Box[0.10.1]=Checkbox,0,547.4062pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_1,2 [192]Variable[0.10.1]=0_10_1 [193]QObject-Option=0.10.2. qb [194]Answer[0.10.2]=a [195]Answer[0.10.2]=b -[196]Box[0.10.2]=Checkbox,0,525.44777pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_2_1,1 -[197]Box[0.10.2]=Checkbox,0,547.4062pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_2_2,2 +[196]Box[0.10.2]=Checkbox,0,525.44777pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_2,1 +[197]Box[0.10.2]=Checkbox,0,547.4062pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_10_2,2 [198]Variable[0.10.2]=0_10_2 [199]Variable[0.10]=0_10 [200]QObject-Head=0.11. Metadata Header [201]QObject-Option=0.11.1. qa [202]Answer[0.11.1]=a [203]Answer[0.11.1]=b -[204]Box[0.11.1]=Checkbox,0,525.44777pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_1_1,1 -[205]Box[0.11.1]=Checkbox,0,547.4062pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_1_2,2 +[204]Box[0.11.1]=Checkbox,0,525.44777pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_1,1 +[205]Box[0.11.1]=Checkbox,0,547.4062pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_1,2 [206]Variable[0.11.1]=0_11_1 [207]QObject-Option=0.11.2. qb [208]Answer[0.11.2]=a [209]Answer[0.11.2]=b -[210]Box[0.11.2]=Checkbox,0,525.44777pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_2_1,1 -[211]Box[0.11.2]=Checkbox,0,547.4062pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_2_2,2 +[210]Box[0.11.2]=Checkbox,0,525.44777pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_2,1 +[211]Box[0.11.2]=Checkbox,0,547.4062pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_11_2,2 [212]Variable[0.11.2]=0_11_2 [213]Variable[0.11]=0_11 [214]QObject-Head=0.12. Header @@ -237,25 +237,25 @@ Package hyperref Warning: Token not allowed in a PDF string (Unicode): [216]Answer[0.12.1]=a [217]Answer[0.12.1]=b [218]Answer[0.12.1]=c -[219]Box[0.12.1]=Checkbox,0,503.48933pt,631.31088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1_1,1 -[220]Box[0.12.1]=Checkbox,0,525.44777pt,631.31088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1_b,2 -[221]Box[0.12.1]=Checkbox,0,547.4062pt,631.31088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1_3,3 +[219]Box[0.12.1]=Checkbox,0,503.48933pt,631.31088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1,1 +[220]Box[0.12.1]=Checkbox,0,525.44777pt,631.31088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1,2 +[221]Box[0.12.1]=Checkbox,0,547.4062pt,631.31088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_1,3 [222]Variable[0.12.1]=test_1 [223]QObject-Option=0.12.2. qb [224]Answer[0.12.2]=a [225]Answer[0.12.2]=b [226]Answer[0.12.2]=c -[227]Box[0.12.2]=Checkbox,0,503.48933pt,617.71088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b_1,1 -[228]Box[0.12.2]=Checkbox,0,525.44777pt,617.71088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b_b,2 -[229]Box[0.12.2]=Checkbox,0,547.4062pt,617.71088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b_3,3 +[227]Box[0.12.2]=Checkbox,0,503.48933pt,617.71088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b,1 +[228]Box[0.12.2]=Checkbox,0,525.44777pt,617.71088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b,2 +[229]Box[0.12.2]=Checkbox,0,547.4062pt,617.71088pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_b,3 [230]Variable[0.12.2]=test_b [231]QObject-Option=0.12.3. qc [232]Answer[0.12.3]=a [233]Answer[0.12.3]=b [234]Answer[0.12.3]=c -[235]Box[0.12.3]=Checkbox,0,503.48933pt,604.11087pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3_1,1 -[236]Box[0.12.3]=Checkbox,0,525.44777pt,604.11087pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3_b,2 -[237]Box[0.12.3]=Checkbox,0,547.4062pt,604.11087pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3_3,3 +[235]Box[0.12.3]=Checkbox,0,503.48933pt,604.11087pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3,1 +[236]Box[0.12.3]=Checkbox,0,525.44777pt,604.11087pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3,2 +[237]Box[0.12.3]=Checkbox,0,547.4062pt,604.11087pt,9.95845pt,9.95845pt,ellipse,1.00374pt,test_3,3 [238]Variable[0.12.3]=test_3 [239]Variable[0.12]=test ] @@ -275,65 +275,65 @@ Package hyperref Warning: Token not allowed in a PDF string (Unicode): [240]QObject-Head=0.13. Inline Header [241]QObject-Range=0.13.1. a [242]Range-lower[0.13.1]=0,lower -[243]Box[0.13.1]=Checkbox,0,424.06308pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_1,1 -[244]Box[0.13.1]=Checkbox,0,444.97151pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_2,2 -[245]Box[0.13.1]=Checkbox,0,465.87994pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_3,3 -[246]Box[0.13.1]=Checkbox,0,486.78838pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_4,4 -[247]Box[0.13.1]=Checkbox,0,507.69681pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1_5,5 +[243]Box[0.13.1]=Checkbox,0,424.06308pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,1 +[244]Box[0.13.1]=Checkbox,0,444.97151pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,2 +[245]Box[0.13.1]=Checkbox,0,465.87994pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,3 +[246]Box[0.13.1]=Checkbox,0,486.78838pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,4 +[247]Box[0.13.1]=Checkbox,0,507.69681pt,767.85446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_1,5 [248]Range-upper[0.13.1]=4,upper [249]Variable[0.13.1]=0_13_1 [250]QObject-Range=0.13.2. b [251]Range-lower[0.13.2]=0,lower -[252]Box[0.13.2]=Checkbox,0,424.06308pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_1,1 -[253]Box[0.13.2]=Checkbox,0,444.97151pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_2,2 -[254]Box[0.13.2]=Checkbox,0,465.87994pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_3,3 -[255]Box[0.13.2]=Checkbox,0,486.78838pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_4,4 -[256]Box[0.13.2]=Checkbox,0,507.69681pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2_5,5 +[252]Box[0.13.2]=Checkbox,0,424.06308pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,1 +[253]Box[0.13.2]=Checkbox,0,444.97151pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,2 +[254]Box[0.13.2]=Checkbox,0,465.87994pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,3 +[255]Box[0.13.2]=Checkbox,0,486.78838pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,4 +[256]Box[0.13.2]=Checkbox,0,507.69681pt,754.25446pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_2,5 [257]Range-upper[0.13.2]=4,upper [258]Variable[0.13.2]=0_13_2 [259]QObject-Range=0.13.3. c [260]Range-lower[0.13.3]=0,l -[261]Box[0.13.3]=Checkbox,0,424.06308pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_1,1 -[262]Box[0.13.3]=Checkbox,0,444.97151pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_2,2 -[263]Box[0.13.3]=Checkbox,0,465.87994pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_3,3 -[264]Box[0.13.3]=Checkbox,0,486.78838pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_4,4 -[265]Box[0.13.3]=Checkbox,0,507.69681pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3_5,5 +[261]Box[0.13.3]=Checkbox,0,424.06308pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,1 +[262]Box[0.13.3]=Checkbox,0,444.97151pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,2 +[263]Box[0.13.3]=Checkbox,0,465.87994pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,3 +[264]Box[0.13.3]=Checkbox,0,486.78838pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,4 +[265]Box[0.13.3]=Checkbox,0,507.69681pt,740.65445pt,9.95845pt,9.95845pt,ellipse,1.00374pt,0_13_3,5 [266]Range-upper[0.13.3]=4,u [267]Variable[0.13.3]=0_13_3 [268]Variable[0.13]=0_13 [269]QObject-Head=0.14. Inline Header [270]QObject-Range=0.14.1. a [271]Range-lower[0.14.1]=0,lower -[272]Box[0.14.1]=Checkbox,0,361.48248pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_1,1 -[273]Box[0.14.1]=Checkbox,0,382.39091pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_2,2 -[274]Box[0.14.1]=Checkbox,0,403.29935pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_3,3 -[275]Box[0.14.1]=Checkbox,0,424.20778pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_4,4 -[276]Box[0.14.1]=Checkbox,0,445.11621pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_5,5 +[272]Box[0.14.1]=Checkbox,0,361.48248pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,1 +[273]Box[0.14.1]=Checkbox,0,382.39091pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,2 +[274]Box[0.14.1]=Checkbox,0,403.29935pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,3 +[275]Box[0.14.1]=Checkbox,0,424.20778pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,4 +[276]Box[0.14.1]=Checkbox,0,445.11621pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,5 [277]Range-upper[0.14.1]=4,upper [278]Answer[0.14.1]=other -[279]Box[0.14.1]=Checkbox,0,518.78404pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1_6,0 +[279]Box[0.14.1]=Checkbox,0,518.78404pt,706.38268pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_1,0 [280]Variable[0.14.1]=a_1 [281]QObject-Range=0.14.2. b [282]Range-lower[0.14.2]=0,lower -[283]Box[0.14.2]=Checkbox,0,361.48248pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_1,1 -[284]Box[0.14.2]=Checkbox,0,382.39091pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_2,2 -[285]Box[0.14.2]=Checkbox,0,403.29935pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_3,3 -[286]Box[0.14.2]=Checkbox,0,424.20778pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_4,4 -[287]Box[0.14.2]=Checkbox,0,445.11621pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_5,5 +[283]Box[0.14.2]=Checkbox,0,361.48248pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,1 +[284]Box[0.14.2]=Checkbox,0,382.39091pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,2 +[285]Box[0.14.2]=Checkbox,0,403.29935pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,3 +[286]Box[0.14.2]=Checkbox,0,424.20778pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,4 +[287]Box[0.14.2]=Checkbox,0,445.11621pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,5 [288]Range-upper[0.14.2]=4,upper [289]Answer[0.14.2]=other -[290]Box[0.14.2]=Checkbox,0,518.78404pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b_6,0 +[290]Box[0.14.2]=Checkbox,0,518.78404pt,692.78267pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_b,0 [291]Variable[0.14.2]=a_b [292]QObject-Range=0.14.3. c [293]Range-lower[0.14.3]=0,l -[294]Box[0.14.3]=Checkbox,0,361.48248pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_1,1 -[295]Box[0.14.3]=Checkbox,0,382.39091pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_2,2 -[296]Box[0.14.3]=Checkbox,0,403.29935pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_3,3 -[297]Box[0.14.3]=Checkbox,0,424.20778pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_4,4 -[298]Box[0.14.3]=Checkbox,0,445.11621pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_5,5 +[294]Box[0.14.3]=Checkbox,0,361.48248pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,1 +[295]Box[0.14.3]=Checkbox,0,382.39091pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,2 +[296]Box[0.14.3]=Checkbox,0,403.29935pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,3 +[297]Box[0.14.3]=Checkbox,0,424.20778pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,4 +[298]Box[0.14.3]=Checkbox,0,445.11621pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,5 [299]Range-upper[0.14.3]=4,u [300]Answer[0.14.3]=other -[301]Box[0.14.3]=Checkbox,0,518.78404pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3_6,0 +[301]Box[0.14.3]=Checkbox,0,518.78404pt,679.18266pt,9.95845pt,9.95845pt,ellipse,1.00374pt,a_3,0 [302]Variable[0.14.3]=a_3 [303]Variable[0.14]=a ] diff --git a/testfiles/layout.tlg b/testfiles/layout.tlg index 438a82e..56e20eb 100644 --- a/testfiles/layout.tlg +++ b/testfiles/layout.tlg @@ -38,25 +38,25 @@ TEST 2: Basic singlechoice choicearray [26]Answer[4]=a [27]Answer[4]=b [28]Answer[4]=c -[29]Box[4]=Checkbox,0,448.00644pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4_1,1 -[30]Box[4]=Checkbox,0,469.96487pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4_2,2 -[31]Box[4]=Checkbox,0,491.92331pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4_3,3 +[29]Box[4]=Checkbox,0,448.00644pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4,1 +[30]Box[4]=Checkbox,0,469.96487pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4,2 +[31]Box[4]=Checkbox,0,491.92331pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4,3 [32]Variable[4]=4 [33]QObject-Option=5. qb [34]Answer[5]=a [35]Answer[5]=b [36]Answer[5]=c -[37]Box[5]=Checkbox,0,448.00644pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5_1,1 -[38]Box[5]=Checkbox,0,469.96487pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5_2,2 -[39]Box[5]=Checkbox,0,491.92331pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5_3,3 +[37]Box[5]=Checkbox,0,448.00644pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5,1 +[38]Box[5]=Checkbox,0,469.96487pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5,2 +[39]Box[5]=Checkbox,0,491.92331pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5,3 [40]Variable[5]=5 [41]QObject-Option=6. qc [42]Answer[6]=a [43]Answer[6]=b [44]Answer[6]=c -[45]Box[6]=Checkbox,0,448.00644pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6_1,1 -[46]Box[6]=Checkbox,0,469.96487pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6_2,2 -[47]Box[6]=Checkbox,0,491.92331pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6_3,3 +[45]Box[6]=Checkbox,0,448.00644pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6,1 +[46]Box[6]=Checkbox,0,469.96487pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6,2 +[47]Box[6]=Checkbox,0,491.92331pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6,3 [48]Variable[6]=6 ] ============================================================ @@ -149,78 +149,78 @@ TEST 4: choicearray range filtering for singlechoice [125]QObject-Option=19. start-2 [126]Answer[19]=a [127]Answer[19]=b -[128]Box[19]=Checkbox,0,448.00644pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,19_1,1 -[129]Box[19]=Checkbox,0,469.96487pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,19_2,2 +[128]Box[19]=Checkbox,0,448.00644pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,19,1 +[129]Box[19]=Checkbox,0,469.96487pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,19,2 [130]Variable[19]=19 [131]QObject-Option=20. 2-end [132]Answer[20]=b [133]Answer[20]=c -[134]Box[20]=Checkbox,0,469.96487pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,20_2,2 -[135]Box[20]=Checkbox,0,491.92331pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,20_3,3 +[134]Box[20]=Checkbox,0,469.96487pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,20,2 +[135]Box[20]=Checkbox,0,491.92331pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,20,3 [136]Variable[20]=20 [137]QObject-Option=21. 1-2 [138]Answer[21]=a [139]Answer[21]=b -[140]Box[21]=Checkbox,0,448.00644pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,21_1,1 -[141]Box[21]=Checkbox,0,469.96487pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,21_2,2 +[140]Box[21]=Checkbox,0,448.00644pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,21,1 +[141]Box[21]=Checkbox,0,469.96487pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,21,2 [142]Variable[21]=21 [143]QObject-Option=22. 1 and 3 [144]Answer[22]=a [145]Answer[22]=c -[146]Box[22]=Checkbox,0,448.00644pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,22_1,1 -[147]Box[22]=Checkbox,0,491.92331pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,22_3,3 +[146]Box[22]=Checkbox,0,448.00644pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,22,1 +[147]Box[22]=Checkbox,0,491.92331pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,22,3 [148]Variable[22]=22 [149]QObject-Option=23. range to 1 and 3 [150]Answer[23]=a [151]Answer[23]=c -[152]Box[23]=Checkbox,0,448.00644pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,23_1,1 -[153]Box[23]=Checkbox,0,491.92331pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,23_3,3 +[152]Box[23]=Checkbox,0,448.00644pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,23,1 +[153]Box[23]=Checkbox,0,491.92331pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,23,3 [154]Variable[23]=23 [155]QObject-Option=24. 1 and 2 plus end [156]Answer[24]=a [157]Answer[24]=b [158]Answer[24]=c -[159]Box[24]=Checkbox,0,448.00644pt,676.69312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24_1,1 -[160]Box[24]=Checkbox,0,469.96487pt,676.69312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24_2,2 -[161]Box[24]=Checkbox,0,491.92331pt,676.69312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24_3,3 +[159]Box[24]=Checkbox,0,448.00644pt,676.69312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24,1 +[160]Box[24]=Checkbox,0,469.96487pt,676.69312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24,2 +[161]Box[24]=Checkbox,0,491.92331pt,676.69312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24,3 [162]Variable[24]=24 [163]QObject-Option=25. start-2 [164]Answer[25]=a [165]Answer[25]=b -[166]Box[25]=Checkbox,0,448.00644pt,649.4931pt,9.95845pt,9.95845pt,ellipse,1.00374pt,25_1,11 -[167]Box[25]=Checkbox,0,469.96487pt,649.4931pt,9.95845pt,9.95845pt,ellipse,1.00374pt,25_2,12 +[166]Box[25]=Checkbox,0,448.00644pt,649.4931pt,9.95845pt,9.95845pt,ellipse,1.00374pt,25,11 +[167]Box[25]=Checkbox,0,469.96487pt,649.4931pt,9.95845pt,9.95845pt,ellipse,1.00374pt,25,12 [168]Variable[25]=25 [169]QObject-Option=26. 2-end [170]Answer[26]=b [171]Answer[26]=c -[172]Box[26]=Checkbox,0,469.96487pt,635.8931pt,9.95845pt,9.95845pt,ellipse,1.00374pt,26_2,12 -[173]Box[26]=Checkbox,0,491.92331pt,635.8931pt,9.95845pt,9.95845pt,ellipse,1.00374pt,26_3,13 +[172]Box[26]=Checkbox,0,469.96487pt,635.8931pt,9.95845pt,9.95845pt,ellipse,1.00374pt,26,12 +[173]Box[26]=Checkbox,0,491.92331pt,635.8931pt,9.95845pt,9.95845pt,ellipse,1.00374pt,26,13 [174]Variable[26]=26 [175]QObject-Option=27. 1-2 [176]Answer[27]=a [177]Answer[27]=b -[178]Box[27]=Checkbox,0,448.00644pt,622.29309pt,9.95845pt,9.95845pt,ellipse,1.00374pt,27_1,11 -[179]Box[27]=Checkbox,0,469.96487pt,622.29309pt,9.95845pt,9.95845pt,ellipse,1.00374pt,27_2,12 +[178]Box[27]=Checkbox,0,448.00644pt,622.29309pt,9.95845pt,9.95845pt,ellipse,1.00374pt,27,11 +[179]Box[27]=Checkbox,0,469.96487pt,622.29309pt,9.95845pt,9.95845pt,ellipse,1.00374pt,27,12 [180]Variable[27]=27 [181]QObject-Option=28. 1 and 3 [182]Answer[28]=a [183]Answer[28]=c -[184]Box[28]=Checkbox,0,448.00644pt,608.69308pt,9.95845pt,9.95845pt,ellipse,1.00374pt,28_1,11 -[185]Box[28]=Checkbox,0,491.92331pt,608.69308pt,9.95845pt,9.95845pt,ellipse,1.00374pt,28_3,13 +[184]Box[28]=Checkbox,0,448.00644pt,608.69308pt,9.95845pt,9.95845pt,ellipse,1.00374pt,28,11 +[185]Box[28]=Checkbox,0,491.92331pt,608.69308pt,9.95845pt,9.95845pt,ellipse,1.00374pt,28,13 [186]Variable[28]=28 [187]QObject-Option=29. range to 1 and 3 [188]Answer[29]=a [189]Answer[29]=c -[190]Box[29]=Checkbox,0,448.00644pt,595.09308pt,9.95845pt,9.95845pt,ellipse,1.00374pt,29_1,11 -[191]Box[29]=Checkbox,0,491.92331pt,595.09308pt,9.95845pt,9.95845pt,ellipse,1.00374pt,29_3,13 +[190]Box[29]=Checkbox,0,448.00644pt,595.09308pt,9.95845pt,9.95845pt,ellipse,1.00374pt,29,11 +[191]Box[29]=Checkbox,0,491.92331pt,595.09308pt,9.95845pt,9.95845pt,ellipse,1.00374pt,29,13 [192]Variable[29]=29 [193]QObject-Option=30. 1 and 2 plus end [194]Answer[30]=a [195]Answer[30]=b [196]Answer[30]=c -[197]Box[30]=Checkbox,0,448.00644pt,581.49307pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30_1,11 -[198]Box[30]=Checkbox,0,469.96487pt,581.49307pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30_2,12 -[199]Box[30]=Checkbox,0,491.92331pt,581.49307pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30_3,13 +[197]Box[30]=Checkbox,0,448.00644pt,581.49307pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30,11 +[198]Box[30]=Checkbox,0,469.96487pt,581.49307pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30,12 +[199]Box[30]=Checkbox,0,491.92331pt,581.49307pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30,13 [200]Variable[30]=30 ] ============================================================ @@ -466,63 +466,63 @@ TEST 9: rangearray [10 [413]QObject-Range=58. qa [414]Range-lower[58]=0,lower -[415]Box[58]=Checkbox,0,367.54602pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_1,1 -[416]Box[58]=Checkbox,0,388.45448pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_2,2 -[417]Box[58]=Checkbox,0,409.36295pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_3,3 -[418]Box[58]=Checkbox,0,430.27141pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_4,4 -[419]Box[58]=Checkbox,0,451.17987pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_5,5 +[415]Box[58]=Checkbox,0,367.54602pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,1 +[416]Box[58]=Checkbox,0,388.45448pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,2 +[417]Box[58]=Checkbox,0,409.36295pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,3 +[418]Box[58]=Checkbox,0,430.27141pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,4 +[419]Box[58]=Checkbox,0,451.17987pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,5 [420]Range-upper[58]=4,upper [421]Variable[58]=58 [422]QObject-Range=59. qb [423]Range-lower[59]=0,lower -[424]Box[59]=Checkbox,0,367.54602pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_1,1 -[425]Box[59]=Checkbox,0,388.45448pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_2,2 -[426]Box[59]=Checkbox,0,409.36295pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_3,3 -[427]Box[59]=Checkbox,0,430.27141pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_4,4 -[428]Box[59]=Checkbox,0,451.17987pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_5,5 +[424]Box[59]=Checkbox,0,367.54602pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,1 +[425]Box[59]=Checkbox,0,388.45448pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,2 +[426]Box[59]=Checkbox,0,409.36295pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,3 +[427]Box[59]=Checkbox,0,430.27141pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,4 +[428]Box[59]=Checkbox,0,451.17987pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,5 [429]Range-upper[59]=4,upper [430]Variable[59]=59 [431]QObject-Range=60. question text [432]Range-lower[60]=0,textlower -[433]Box[60]=Checkbox,0,367.54602pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_1,1 -[434]Box[60]=Checkbox,0,388.45448pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_2,2 -[435]Box[60]=Checkbox,0,409.36295pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_3,3 -[436]Box[60]=Checkbox,0,430.27141pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_4,4 -[437]Box[60]=Checkbox,0,451.17987pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_5,5 +[433]Box[60]=Checkbox,0,367.54602pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,1 +[434]Box[60]=Checkbox,0,388.45448pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,2 +[435]Box[60]=Checkbox,0,409.36295pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,3 +[436]Box[60]=Checkbox,0,430.27141pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,4 +[437]Box[60]=Checkbox,0,451.17987pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,5 [438]Range-upper[60]=4,textupper [439]Variable[60]=60 [440]QObject-Range=61. qa [441]Range-lower[61]=0,lower -[442]Box[61]=Checkbox,0,301.19415pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_1,1 -[443]Box[61]=Checkbox,0,322.10262pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_2,2 -[444]Box[61]=Checkbox,0,343.01108pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_3,3 -[445]Box[61]=Checkbox,0,363.91954pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_4,4 -[446]Box[61]=Checkbox,0,384.828pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_5,5 +[442]Box[61]=Checkbox,0,301.19415pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,1 +[443]Box[61]=Checkbox,0,322.10262pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,2 +[444]Box[61]=Checkbox,0,343.01108pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,3 +[445]Box[61]=Checkbox,0,363.91954pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,4 +[446]Box[61]=Checkbox,0,384.828pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,5 [447]Range-upper[61]=4,upper [448]Answer[61]=other -[449]Box[61]=Checkbox,0,459.52988pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_6,0 +[449]Box[61]=Checkbox,0,459.52988pt,717.49313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,0 [450]Variable[61]=61 [451]QObject-Range=62. qb [452]Range-lower[62]=0,lower -[453]Box[62]=Checkbox,0,301.19415pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_1,1 -[454]Box[62]=Checkbox,0,322.10262pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_2,2 -[455]Box[62]=Checkbox,0,343.01108pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_3,3 -[456]Box[62]=Checkbox,0,363.91954pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_4,4 -[457]Box[62]=Checkbox,0,384.828pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_5,5 +[453]Box[62]=Checkbox,0,301.19415pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,1 +[454]Box[62]=Checkbox,0,322.10262pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,2 +[455]Box[62]=Checkbox,0,343.01108pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,3 +[456]Box[62]=Checkbox,0,363.91954pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,4 +[457]Box[62]=Checkbox,0,384.828pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,5 [458]Range-upper[62]=4,upper [459]Answer[62]=other -[460]Box[62]=Checkbox,0,459.52988pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_6,0 +[460]Box[62]=Checkbox,0,459.52988pt,703.89313pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,0 [461]Variable[62]=62 [462]QObject-Range=63. question text [463]Range-lower[63]=0,textlower -[464]Box[63]=Checkbox,0,301.19415pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_1,1 -[465]Box[63]=Checkbox,0,322.10262pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_2,2 -[466]Box[63]=Checkbox,0,343.01108pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_3,3 -[467]Box[63]=Checkbox,0,363.91954pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_4,4 -[468]Box[63]=Checkbox,0,384.828pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_5,5 +[464]Box[63]=Checkbox,0,301.19415pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,1 +[465]Box[63]=Checkbox,0,322.10262pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,2 +[466]Box[63]=Checkbox,0,343.01108pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,3 +[467]Box[63]=Checkbox,0,363.91954pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,4 +[468]Box[63]=Checkbox,0,384.828pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,5 [469]Range-upper[63]=4,textupper [470]Answer[63]=textother -[471]Box[63]=Checkbox,0,459.52988pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_6,0 +[471]Box[63]=Checkbox,0,459.52988pt,690.29312pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,0 [472]Variable[63]=63 ] ============================================================ @@ -532,29 +532,29 @@ TEST 10: rangearray with variable names [11 [473]QObject-Range=64. qa [474]Range-lower[64]=0,lower -[475]Box[64]=Checkbox,0,368.57983pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_1,1 -[476]Box[64]=Checkbox,0,389.4883pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_2,2 -[477]Box[64]=Checkbox,0,410.39676pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_3,3 -[478]Box[64]=Checkbox,0,431.30522pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_4,4 -[479]Box[64]=Checkbox,0,452.21368pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_5,5 +[475]Box[64]=Checkbox,0,368.57983pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,1 +[476]Box[64]=Checkbox,0,389.4883pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,2 +[477]Box[64]=Checkbox,0,410.39676pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,3 +[478]Box[64]=Checkbox,0,431.30522pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,4 +[479]Box[64]=Checkbox,0,452.21368pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,5 [480]Range-upper[64]=4,upper [481]Variable[64]=64 [482]QObject-Range=65. qb [483]Range-lower[65]=0,lower -[484]Box[65]=Checkbox,0,368.57983pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_1,1 -[485]Box[65]=Checkbox,0,389.4883pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_2,2 -[486]Box[65]=Checkbox,0,410.39676pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_3,3 -[487]Box[65]=Checkbox,0,431.30522pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_4,4 -[488]Box[65]=Checkbox,0,452.21368pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_5,5 +[484]Box[65]=Checkbox,0,368.57983pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,1 +[485]Box[65]=Checkbox,0,389.4883pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,2 +[486]Box[65]=Checkbox,0,410.39676pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,3 +[487]Box[65]=Checkbox,0,431.30522pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,4 +[488]Box[65]=Checkbox,0,452.21368pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,5 [489]Range-upper[65]=4,upper [490]Variable[65]=qb [491]QObject-Range=66. qc [492]Range-lower[66]=0,lower -[493]Box[66]=Checkbox,0,368.57983pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_1,1 -[494]Box[66]=Checkbox,0,389.4883pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_2,2 -[495]Box[66]=Checkbox,0,410.39676pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_3,3 -[496]Box[66]=Checkbox,0,431.30522pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_4,4 -[497]Box[66]=Checkbox,0,452.21368pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_5,5 +[493]Box[66]=Checkbox,0,368.57983pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,1 +[494]Box[66]=Checkbox,0,389.4883pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,2 +[495]Box[66]=Checkbox,0,410.39676pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,3 +[496]Box[66]=Checkbox,0,431.30522pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,4 +[497]Box[66]=Checkbox,0,452.21368pt,731.09314pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,5 [498]Range-upper[66]=4,upper [499]Variable[66]=66 ] @@ -565,38 +565,38 @@ TEST 11: rangearray over multiple columns [12 [500]QObject-Range=67. qa [501]Range-lower[67]=0,l -[502]Box[67]=Checkbox,0,176.07834pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_1,1 -[503]Box[67]=Checkbox,0,196.9868pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_2,2 -[504]Box[67]=Checkbox,0,217.89526pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_3,3 -[505]Box[67]=Checkbox,0,238.80373pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_4,4 -[506]Box[67]=Checkbox,0,259.71219pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_5,5 +[502]Box[67]=Checkbox,0,176.07834pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,1 +[503]Box[67]=Checkbox,0,196.9868pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,2 +[504]Box[67]=Checkbox,0,217.89526pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,3 +[505]Box[67]=Checkbox,0,238.80373pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,4 +[506]Box[67]=Checkbox,0,259.71219pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,5 [507]Range-upper[67]=4,u [508]Variable[67]=67 [509]QObject-Range=68. qb [510]Range-lower[68]=0,l -[511]Box[68]=Checkbox,0,176.07834pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_1,1 -[512]Box[68]=Checkbox,0,196.9868pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_2,2 -[513]Box[68]=Checkbox,0,217.89526pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_3,3 -[514]Box[68]=Checkbox,0,238.80373pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_4,4 -[515]Box[68]=Checkbox,0,259.71219pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_5,5 +[511]Box[68]=Checkbox,0,176.07834pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,1 +[512]Box[68]=Checkbox,0,196.9868pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,2 +[513]Box[68]=Checkbox,0,217.89526pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,3 +[514]Box[68]=Checkbox,0,238.80373pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,4 +[515]Box[68]=Checkbox,0,259.71219pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,5 [516]Range-upper[68]=4,u [517]Variable[68]=68 [518]QObject-Range=69. qc [519]Range-lower[69]=0,l -[520]Box[69]=Checkbox,0,390.20612pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_1,1 -[521]Box[69]=Checkbox,0,411.11458pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_2,2 -[522]Box[69]=Checkbox,0,432.02304pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_3,3 -[523]Box[69]=Checkbox,0,452.9315pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_4,4 -[524]Box[69]=Checkbox,0,473.83997pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_5,5 +[520]Box[69]=Checkbox,0,390.20612pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,1 +[521]Box[69]=Checkbox,0,411.11458pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,2 +[522]Box[69]=Checkbox,0,432.02304pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,3 +[523]Box[69]=Checkbox,0,452.9315pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,4 +[524]Box[69]=Checkbox,0,473.83997pt,758.29315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,5 [525]Range-upper[69]=4,u [526]Variable[69]=69 [527]QObject-Range=70. qd [528]Range-lower[70]=0,l -[529]Box[70]=Checkbox,0,390.20612pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_1,1 -[530]Box[70]=Checkbox,0,411.11458pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_2,2 -[531]Box[70]=Checkbox,0,432.02304pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_3,3 -[532]Box[70]=Checkbox,0,452.9315pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_4,4 -[533]Box[70]=Checkbox,0,473.83997pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_5,5 +[529]Box[70]=Checkbox,0,390.20612pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,1 +[530]Box[70]=Checkbox,0,411.11458pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,2 +[531]Box[70]=Checkbox,0,432.02304pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,3 +[532]Box[70]=Checkbox,0,452.9315pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,4 +[533]Box[70]=Checkbox,0,473.83997pt,744.69315pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,5 [534]Range-upper[70]=4,u [535]Variable[70]=70 ] diff --git a/testfiles/layout.xetex.tlg b/testfiles/layout.xetex.tlg index 31b0d3c..f51e026 100644 --- a/testfiles/layout.xetex.tlg +++ b/testfiles/layout.xetex.tlg @@ -38,25 +38,25 @@ TEST 2: Basic singlechoice choicearray [26]Answer[4]=a [27]Answer[4]=b [28]Answer[4]=c -[29]Box[4]=Checkbox,0,448.00644pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4_1,1 -[30]Box[4]=Checkbox,0,469.96487pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4_2,2 -[31]Box[4]=Checkbox,0,491.92331pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4_3,3 +[29]Box[4]=Checkbox,0,448.00644pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4,1 +[30]Box[4]=Checkbox,0,469.96487pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4,2 +[31]Box[4]=Checkbox,0,491.92331pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,4,3 [32]Variable[4]=4 [33]QObject-Option=5. qb [34]Answer[5]=a [35]Answer[5]=b [36]Answer[5]=c -[37]Box[5]=Checkbox,0,448.00644pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5_1,1 -[38]Box[5]=Checkbox,0,469.96487pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5_2,2 -[39]Box[5]=Checkbox,0,491.92331pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5_3,3 +[37]Box[5]=Checkbox,0,448.00644pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5,1 +[38]Box[5]=Checkbox,0,469.96487pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5,2 +[39]Box[5]=Checkbox,0,491.92331pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,5,3 [40]Variable[5]=5 [41]QObject-Option=6. qc [42]Answer[6]=a [43]Answer[6]=b [44]Answer[6]=c -[45]Box[6]=Checkbox,0,448.00644pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6_1,1 -[46]Box[6]=Checkbox,0,469.96487pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6_2,2 -[47]Box[6]=Checkbox,0,491.92331pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6_3,3 +[45]Box[6]=Checkbox,0,448.00644pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6,1 +[46]Box[6]=Checkbox,0,469.96487pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6,2 +[47]Box[6]=Checkbox,0,491.92331pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,6,3 [48]Variable[6]=6 ] ============================================================ @@ -149,78 +149,78 @@ TEST 4: choicearray range filtering for singlechoice [125]QObject-Option=19. start-2 [126]Answer[19]=a [127]Answer[19]=b -[128]Box[19]=Checkbox,0,448.00644pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,19_1,1 -[129]Box[19]=Checkbox,0,469.96487pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,19_2,2 +[128]Box[19]=Checkbox,0,448.00644pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,19,1 +[129]Box[19]=Checkbox,0,469.96487pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,19,2 [130]Variable[19]=19 [131]QObject-Option=20. 2-end [132]Answer[20]=b [133]Answer[20]=c -[134]Box[20]=Checkbox,0,469.96487pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,20_2,2 -[135]Box[20]=Checkbox,0,491.92331pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,20_3,3 +[134]Box[20]=Checkbox,0,469.96487pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,20,2 +[135]Box[20]=Checkbox,0,491.92331pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,20,3 [136]Variable[20]=20 [137]QObject-Option=21. 1-2 [138]Answer[21]=a [139]Answer[21]=b -[140]Box[21]=Checkbox,0,448.00644pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,21_1,1 -[141]Box[21]=Checkbox,0,469.96487pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,21_2,2 +[140]Box[21]=Checkbox,0,448.00644pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,21,1 +[141]Box[21]=Checkbox,0,469.96487pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,21,2 [142]Variable[21]=21 [143]QObject-Option=22. 1 and 3 [144]Answer[22]=a [145]Answer[22]=c -[146]Box[22]=Checkbox,0,448.00644pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,22_1,1 -[147]Box[22]=Checkbox,0,491.92331pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,22_3,3 +[146]Box[22]=Checkbox,0,448.00644pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,22,1 +[147]Box[22]=Checkbox,0,491.92331pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,22,3 [148]Variable[22]=22 [149]QObject-Option=23. range to 1 and 3 [150]Answer[23]=a [151]Answer[23]=c -[152]Box[23]=Checkbox,0,448.00644pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,23_1,1 -[153]Box[23]=Checkbox,0,491.92331pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,23_3,3 +[152]Box[23]=Checkbox,0,448.00644pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,23,1 +[153]Box[23]=Checkbox,0,491.92331pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,23,3 [154]Variable[23]=23 [155]QObject-Option=24. 1 and 2 plus end [156]Answer[24]=a [157]Answer[24]=b [158]Answer[24]=c -[159]Box[24]=Checkbox,0,448.00644pt,676.69702pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24_1,1 -[160]Box[24]=Checkbox,0,469.96487pt,676.69702pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24_2,2 -[161]Box[24]=Checkbox,0,491.92331pt,676.69702pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24_3,3 +[159]Box[24]=Checkbox,0,448.00644pt,676.69702pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24,1 +[160]Box[24]=Checkbox,0,469.96487pt,676.69702pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24,2 +[161]Box[24]=Checkbox,0,491.92331pt,676.69702pt,9.95845pt,9.95845pt,ellipse,1.00374pt,24,3 [162]Variable[24]=24 [163]QObject-Option=25. start-2 [164]Answer[25]=a [165]Answer[25]=b -[166]Box[25]=Checkbox,0,448.00644pt,649.49701pt,9.95845pt,9.95845pt,ellipse,1.00374pt,25_1,11 -[167]Box[25]=Checkbox,0,469.96487pt,649.49701pt,9.95845pt,9.95845pt,ellipse,1.00374pt,25_2,12 +[166]Box[25]=Checkbox,0,448.00644pt,649.49701pt,9.95845pt,9.95845pt,ellipse,1.00374pt,25,11 +[167]Box[25]=Checkbox,0,469.96487pt,649.49701pt,9.95845pt,9.95845pt,ellipse,1.00374pt,25,12 [168]Variable[25]=25 [169]QObject-Option=26. 2-end [170]Answer[26]=b [171]Answer[26]=c -[172]Box[26]=Checkbox,0,469.96487pt,635.897pt,9.95845pt,9.95845pt,ellipse,1.00374pt,26_2,12 -[173]Box[26]=Checkbox,0,491.92331pt,635.897pt,9.95845pt,9.95845pt,ellipse,1.00374pt,26_3,13 +[172]Box[26]=Checkbox,0,469.96487pt,635.897pt,9.95845pt,9.95845pt,ellipse,1.00374pt,26,12 +[173]Box[26]=Checkbox,0,491.92331pt,635.897pt,9.95845pt,9.95845pt,ellipse,1.00374pt,26,13 [174]Variable[26]=26 [175]QObject-Option=27. 1-2 [176]Answer[27]=a [177]Answer[27]=b -[178]Box[27]=Checkbox,0,448.00644pt,622.297pt,9.95845pt,9.95845pt,ellipse,1.00374pt,27_1,11 -[179]Box[27]=Checkbox,0,469.96487pt,622.297pt,9.95845pt,9.95845pt,ellipse,1.00374pt,27_2,12 +[178]Box[27]=Checkbox,0,448.00644pt,622.297pt,9.95845pt,9.95845pt,ellipse,1.00374pt,27,11 +[179]Box[27]=Checkbox,0,469.96487pt,622.297pt,9.95845pt,9.95845pt,ellipse,1.00374pt,27,12 [180]Variable[27]=27 [181]QObject-Option=28. 1 and 3 [182]Answer[28]=a [183]Answer[28]=c -[184]Box[28]=Checkbox,0,448.00644pt,608.69699pt,9.95845pt,9.95845pt,ellipse,1.00374pt,28_1,11 -[185]Box[28]=Checkbox,0,491.92331pt,608.69699pt,9.95845pt,9.95845pt,ellipse,1.00374pt,28_3,13 +[184]Box[28]=Checkbox,0,448.00644pt,608.69699pt,9.95845pt,9.95845pt,ellipse,1.00374pt,28,11 +[185]Box[28]=Checkbox,0,491.92331pt,608.69699pt,9.95845pt,9.95845pt,ellipse,1.00374pt,28,13 [186]Variable[28]=28 [187]QObject-Option=29. range to 1 and 3 [188]Answer[29]=a [189]Answer[29]=c -[190]Box[29]=Checkbox,0,448.00644pt,595.09698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,29_1,11 -[191]Box[29]=Checkbox,0,491.92331pt,595.09698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,29_3,13 +[190]Box[29]=Checkbox,0,448.00644pt,595.09698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,29,11 +[191]Box[29]=Checkbox,0,491.92331pt,595.09698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,29,13 [192]Variable[29]=29 [193]QObject-Option=30. 1 and 2 plus end [194]Answer[30]=a [195]Answer[30]=b [196]Answer[30]=c -[197]Box[30]=Checkbox,0,448.00644pt,581.49698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30_1,11 -[198]Box[30]=Checkbox,0,469.96487pt,581.49698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30_2,12 -[199]Box[30]=Checkbox,0,491.92331pt,581.49698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30_3,13 +[197]Box[30]=Checkbox,0,448.00644pt,581.49698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30,11 +[198]Box[30]=Checkbox,0,469.96487pt,581.49698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30,12 +[199]Box[30]=Checkbox,0,491.92331pt,581.49698pt,9.95845pt,9.95845pt,ellipse,1.00374pt,30,13 [200]Variable[30]=30 ] ============================================================ @@ -466,63 +466,63 @@ TEST 9: rangearray [10 [413]QObject-Range=58. qa [414]Range-lower[58]=0,lower -[415]Box[58]=Checkbox,0,367.54584pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_1,1 -[416]Box[58]=Checkbox,0,388.45427pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_2,2 -[417]Box[58]=Checkbox,0,409.3627pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_3,3 -[418]Box[58]=Checkbox,0,430.27113pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_4,4 -[419]Box[58]=Checkbox,0,451.17957pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58_5,5 +[415]Box[58]=Checkbox,0,367.54584pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,1 +[416]Box[58]=Checkbox,0,388.45427pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,2 +[417]Box[58]=Checkbox,0,409.3627pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,3 +[418]Box[58]=Checkbox,0,430.27113pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,4 +[419]Box[58]=Checkbox,0,451.17957pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,58,5 [420]Range-upper[58]=4,upper [421]Variable[58]=58 [422]QObject-Range=59. qb [423]Range-lower[59]=0,lower -[424]Box[59]=Checkbox,0,367.54584pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_1,1 -[425]Box[59]=Checkbox,0,388.45427pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_2,2 -[426]Box[59]=Checkbox,0,409.3627pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_3,3 -[427]Box[59]=Checkbox,0,430.27113pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_4,4 -[428]Box[59]=Checkbox,0,451.17957pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59_5,5 +[424]Box[59]=Checkbox,0,367.54584pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,1 +[425]Box[59]=Checkbox,0,388.45427pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,2 +[426]Box[59]=Checkbox,0,409.3627pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,3 +[427]Box[59]=Checkbox,0,430.27113pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,4 +[428]Box[59]=Checkbox,0,451.17957pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,59,5 [429]Range-upper[59]=4,upper [430]Variable[59]=59 [431]QObject-Range=60. question text [432]Range-lower[60]=0,textlower -[433]Box[60]=Checkbox,0,367.54584pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_1,1 -[434]Box[60]=Checkbox,0,388.45427pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_2,2 -[435]Box[60]=Checkbox,0,409.3627pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_3,3 -[436]Box[60]=Checkbox,0,430.27113pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_4,4 -[437]Box[60]=Checkbox,0,451.17957pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60_5,5 +[433]Box[60]=Checkbox,0,367.54584pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,1 +[434]Box[60]=Checkbox,0,388.45427pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,2 +[435]Box[60]=Checkbox,0,409.3627pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,3 +[436]Box[60]=Checkbox,0,430.27113pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,4 +[437]Box[60]=Checkbox,0,451.17957pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,60,5 [438]Range-upper[60]=4,textupper [439]Variable[60]=60 [440]QObject-Range=61. qa [441]Range-lower[61]=0,lower -[442]Box[61]=Checkbox,0,301.19731pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_1,1 -[443]Box[61]=Checkbox,0,322.10574pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_2,2 -[444]Box[61]=Checkbox,0,343.01418pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_3,3 -[445]Box[61]=Checkbox,0,363.9226pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_4,4 -[446]Box[61]=Checkbox,0,384.83104pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_5,5 +[442]Box[61]=Checkbox,0,301.19731pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,1 +[443]Box[61]=Checkbox,0,322.10574pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,2 +[444]Box[61]=Checkbox,0,343.01418pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,3 +[445]Box[61]=Checkbox,0,363.9226pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,4 +[446]Box[61]=Checkbox,0,384.83104pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,5 [447]Range-upper[61]=4,upper [448]Answer[61]=other -[449]Box[61]=Checkbox,0,459.53322pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61_6,0 +[449]Box[61]=Checkbox,0,459.53322pt,717.49704pt,9.95845pt,9.95845pt,ellipse,1.00374pt,61,0 [450]Variable[61]=61 [451]QObject-Range=62. qb [452]Range-lower[62]=0,lower -[453]Box[62]=Checkbox,0,301.19731pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_1,1 -[454]Box[62]=Checkbox,0,322.10574pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_2,2 -[455]Box[62]=Checkbox,0,343.01418pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_3,3 -[456]Box[62]=Checkbox,0,363.9226pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_4,4 -[457]Box[62]=Checkbox,0,384.83104pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_5,5 +[453]Box[62]=Checkbox,0,301.19731pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,1 +[454]Box[62]=Checkbox,0,322.10574pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,2 +[455]Box[62]=Checkbox,0,343.01418pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,3 +[456]Box[62]=Checkbox,0,363.9226pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,4 +[457]Box[62]=Checkbox,0,384.83104pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,5 [458]Range-upper[62]=4,upper [459]Answer[62]=other -[460]Box[62]=Checkbox,0,459.53322pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62_6,0 +[460]Box[62]=Checkbox,0,459.53322pt,703.89703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,62,0 [461]Variable[62]=62 [462]QObject-Range=63. question text [463]Range-lower[63]=0,textlower -[464]Box[63]=Checkbox,0,301.19731pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_1,1 -[465]Box[63]=Checkbox,0,322.10574pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_2,2 -[466]Box[63]=Checkbox,0,343.01418pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_3,3 -[467]Box[63]=Checkbox,0,363.9226pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_4,4 -[468]Box[63]=Checkbox,0,384.83104pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_5,5 +[464]Box[63]=Checkbox,0,301.19731pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,1 +[465]Box[63]=Checkbox,0,322.10574pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,2 +[466]Box[63]=Checkbox,0,343.01418pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,3 +[467]Box[63]=Checkbox,0,363.9226pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,4 +[468]Box[63]=Checkbox,0,384.83104pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,5 [469]Range-upper[63]=4,textupper [470]Answer[63]=textother -[471]Box[63]=Checkbox,0,459.53322pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63_6,0 +[471]Box[63]=Checkbox,0,459.53322pt,690.29703pt,9.95845pt,9.95845pt,ellipse,1.00374pt,63,0 [472]Variable[63]=63 ] ============================================================ @@ -532,29 +532,29 @@ TEST 10: rangearray with variable names [11 [473]QObject-Range=64. qa [474]Range-lower[64]=0,lower -[475]Box[64]=Checkbox,0,368.5642pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_1,1 -[476]Box[64]=Checkbox,0,389.47263pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_2,2 -[477]Box[64]=Checkbox,0,410.38106pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_3,3 -[478]Box[64]=Checkbox,0,431.28949pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_4,4 -[479]Box[64]=Checkbox,0,452.19792pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64_5,5 +[475]Box[64]=Checkbox,0,368.5642pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,1 +[476]Box[64]=Checkbox,0,389.47263pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,2 +[477]Box[64]=Checkbox,0,410.38106pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,3 +[478]Box[64]=Checkbox,0,431.28949pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,4 +[479]Box[64]=Checkbox,0,452.19792pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,64,5 [480]Range-upper[64]=4,upper [481]Variable[64]=64 [482]QObject-Range=65. qb [483]Range-lower[65]=0,lower -[484]Box[65]=Checkbox,0,368.5642pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_1,1 -[485]Box[65]=Checkbox,0,389.47263pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_2,2 -[486]Box[65]=Checkbox,0,410.38106pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_3,3 -[487]Box[65]=Checkbox,0,431.28949pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_4,4 -[488]Box[65]=Checkbox,0,452.19792pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb_5,5 +[484]Box[65]=Checkbox,0,368.5642pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,1 +[485]Box[65]=Checkbox,0,389.47263pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,2 +[486]Box[65]=Checkbox,0,410.38106pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,3 +[487]Box[65]=Checkbox,0,431.28949pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,4 +[488]Box[65]=Checkbox,0,452.19792pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,qb,5 [489]Range-upper[65]=4,upper [490]Variable[65]=qb [491]QObject-Range=66. qc [492]Range-lower[66]=0,lower -[493]Box[66]=Checkbox,0,368.5642pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_1,1 -[494]Box[66]=Checkbox,0,389.47263pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_2,2 -[495]Box[66]=Checkbox,0,410.38106pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_3,3 -[496]Box[66]=Checkbox,0,431.28949pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_4,4 -[497]Box[66]=Checkbox,0,452.19792pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66_5,5 +[493]Box[66]=Checkbox,0,368.5642pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,1 +[494]Box[66]=Checkbox,0,389.47263pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,2 +[495]Box[66]=Checkbox,0,410.38106pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,3 +[496]Box[66]=Checkbox,0,431.28949pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,4 +[497]Box[66]=Checkbox,0,452.19792pt,731.09705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,66,5 [498]Range-upper[66]=4,upper [499]Variable[66]=66 ] @@ -565,38 +565,38 @@ TEST 11: rangearray over multiple columns [12 [500]QObject-Range=67. qa [501]Range-lower[67]=0,l -[502]Box[67]=Checkbox,0,176.07361pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_1,1 -[503]Box[67]=Checkbox,0,196.98204pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_2,2 -[504]Box[67]=Checkbox,0,217.89047pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_3,3 -[505]Box[67]=Checkbox,0,238.7989pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_4,4 -[506]Box[67]=Checkbox,0,259.70734pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67_5,5 +[502]Box[67]=Checkbox,0,176.07361pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,1 +[503]Box[67]=Checkbox,0,196.98204pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,2 +[504]Box[67]=Checkbox,0,217.89047pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,3 +[505]Box[67]=Checkbox,0,238.7989pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,4 +[506]Box[67]=Checkbox,0,259.70734pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,67,5 [507]Range-upper[67]=4,u [508]Variable[67]=67 [509]QObject-Range=68. qb [510]Range-lower[68]=0,l -[511]Box[68]=Checkbox,0,176.07361pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_1,1 -[512]Box[68]=Checkbox,0,196.98204pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_2,2 -[513]Box[68]=Checkbox,0,217.89047pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_3,3 -[514]Box[68]=Checkbox,0,238.7989pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_4,4 -[515]Box[68]=Checkbox,0,259.70734pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68_5,5 +[511]Box[68]=Checkbox,0,176.07361pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,1 +[512]Box[68]=Checkbox,0,196.98204pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,2 +[513]Box[68]=Checkbox,0,217.89047pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,3 +[514]Box[68]=Checkbox,0,238.7989pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,4 +[515]Box[68]=Checkbox,0,259.70734pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,68,5 [516]Range-upper[68]=4,u [517]Variable[68]=68 [518]QObject-Range=69. qc [519]Range-lower[69]=0,l -[520]Box[69]=Checkbox,0,390.20139pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_1,1 -[521]Box[69]=Checkbox,0,411.10982pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_2,2 -[522]Box[69]=Checkbox,0,432.01825pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_3,3 -[523]Box[69]=Checkbox,0,452.92668pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_4,4 -[524]Box[69]=Checkbox,0,473.83511pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69_5,5 +[520]Box[69]=Checkbox,0,390.20139pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,1 +[521]Box[69]=Checkbox,0,411.10982pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,2 +[522]Box[69]=Checkbox,0,432.01825pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,3 +[523]Box[69]=Checkbox,0,452.92668pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,4 +[524]Box[69]=Checkbox,0,473.83511pt,758.29706pt,9.95845pt,9.95845pt,ellipse,1.00374pt,69,5 [525]Range-upper[69]=4,u [526]Variable[69]=69 [527]QObject-Range=70. qd [528]Range-lower[70]=0,l -[529]Box[70]=Checkbox,0,390.20139pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_1,1 -[530]Box[70]=Checkbox,0,411.10982pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_2,2 -[531]Box[70]=Checkbox,0,432.01825pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_3,3 -[532]Box[70]=Checkbox,0,452.92668pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_4,4 -[533]Box[70]=Checkbox,0,473.83511pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70_5,5 +[529]Box[70]=Checkbox,0,390.20139pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,1 +[530]Box[70]=Checkbox,0,411.10982pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,2 +[531]Box[70]=Checkbox,0,432.01825pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,3 +[532]Box[70]=Checkbox,0,452.92668pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,4 +[533]Box[70]=Checkbox,0,473.83511pt,744.69705pt,9.95845pt,9.95845pt,ellipse,1.00374pt,70,5 [534]Range-upper[70]=4,u [535]Variable[70]=70 ] From f30a46a4171b7bda6dfbac73e9e18b4c84412241 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Sun, 25 Apr 2021 22:37:12 +0200 Subject: [PATCH 2/3] sphinx: Fix running against newer sphinx versions Seems like they renamed l_ to __. Just import the original function and define the shortcut ourselves to avoid issues. --- sphinx/extensions/texdomain.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx/extensions/texdomain.py b/sphinx/extensions/texdomain.py index b0a0d70..27b23f4 100644 --- a/sphinx/extensions/texdomain.py +++ b/sphinx/extensions/texdomain.py @@ -11,13 +11,16 @@ import re from sphinx import addnodes from sphinx.domains import Domain, ObjType -from sphinx.locale import l_, _ +from sphinx.locale import get_translation from sphinx.directives import ObjectDescription from sphinx.roles import XRefRole from sphinx.util.nodes import make_refnode from sphinx.util.docfields import Field, GroupedField, TypedField from docutils import nodes +# Copied from sphinx.locale, and changed back __ to l_ +_ = get_translation('sphinx') +l_ = get_translation('sphinx', 'console') class desc_texenvcontent(nodes.Part, nodes.TextElement): """Node for a general parameter list.""" From 3aa7cd16750c1748151f317c66de9d3f1b7e6203 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Sun, 25 Apr 2021 20:15:30 +0200 Subject: [PATCH 3/3] Release version 2.0 --- README | 2 +- build.lua | 2 +- sdapsbase.dtx | 2 +- testfiles/base.tlg | 2 +- testfiles/base.xetex.tlg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 178888e..c176d5c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ SDAPS Class and Package repository ================================== -Version: 1.9.9 +Version: 2.0 This repository contains LaTeX classes and packages to create machine readable questionnaires. Metadata is generated for the whole document and it is diff --git a/build.lua b/build.lua index a9ea7ff..229ebbd 100755 --- a/build.lua +++ b/build.lua @@ -27,7 +27,7 @@ uploadconfig = { repository = "https://github.com/sdaps/sdaps-class/", bugtracker = "https://github.com/sdaps/sdaps-class/issues", update = true, - version = "1.9.9", + version = "2.0", description = [[ This module contains LaTeX classes and packages to create machine readable questionnaires. Metadata is generated for the whole document and it is diff --git a/sdapsbase.dtx b/sdapsbase.dtx index c8f77c5..4a2518c 100644 --- a/sdapsbase.dtx +++ b/sdapsbase.dtx @@ -1770,7 +1770,7 @@ \bool_gset:Nn \g__sdaps_last_page_bool \c_false_bool % TODO: We really want to make sure nobody modifies the values after \sdaps_begin: - \sdaps_info_write:x{SDAPSVersion=1.9.9} + \sdaps_info_write:x{SDAPSVersion=2.0} \sdaps_info_write:x{Duplex=\bool_if:NTF \g_sdaps_twoside_bool {true} {false}} \sdaps_info_write:x{PrintQuestionnaireId=\bool_if:NTF \g_sdaps_print_questionnaire_id_bool {1} {0}} \sdaps_info_write:x{ diff --git a/testfiles/base.tlg b/testfiles/base.tlg index 5eea780..92bbfa6 100644 --- a/testfiles/base.tlg +++ b/testfiles/base.tlg @@ -11,7 +11,7 @@ TEST 1: Initialize SDAPS encoded: \startC ,32,49,89,23,00,01,85,\stop , black-white: 21123223212121133121214131213121222222212212421123311120 [1 -[1]SDAPSVersion=1.9.9 +[1]SDAPSVersion=2.0 [2]Duplex=false [3]PrintQuestionnaireId=0 [4]PageSize=597.50793pt,845.04694pt diff --git a/testfiles/base.xetex.tlg b/testfiles/base.xetex.tlg index edb304d..7f52395 100644 --- a/testfiles/base.xetex.tlg +++ b/testfiles/base.xetex.tlg @@ -11,7 +11,7 @@ TEST 1: Initialize SDAPS encoded: \startC ,32,49,89,23,00,01,85,\stop , black-white: 21123223212121133121214131213121222222212212421123311120 [1 -[1]SDAPSVersion=1.9.9 +[1]SDAPSVersion=2.0 [2]Duplex=false [3]PrintQuestionnaireId=0 [4]PageSize=597.50793pt,845.04694pt