Строка 246: |
Строка 246: |
| term_with_link = frame.args['author'] ..', «'.. term_with_link ..'»' | | term_with_link = frame.args['author'] ..', «'.. term_with_link ..'»' |
| term_without_link = frame.args['author'] ..', «'.. term_without_link ..'»' | | term_without_link = frame.args['author'] ..', «'.. term_without_link ..'»' |
− | end
| |
− | -- add publishing date for a literature and lifetime for a person
| |
− | if term_type == 'литература' or term_type == 'личность' then
| |
− | term_without_link = term_without_link ..', '.. lifetime
| |
| end | | end |
| -- add volume, chapter, page and so on | | -- add volume, chapter, page and so on |
Строка 260: |
Строка 256: |
| if view_popup then | | if view_popup then |
| if term_type == 'литература' or term_type == 'личность' then | | if term_type == 'литература' or term_type == 'личность' then |
− | output_str = term_without_link | + | output_str = term_without_link ..', '.. lifetime |
| else -- для 'понятие' и 'выражение' | | else -- для 'понятие' и 'выражение' |
| output_str = description | | output_str = description |
Строка 267: |
Строка 263: |
| if add_description then output_str = output_str ..'. – '.. description end | | if add_description then output_str = output_str ..'. – '.. description end |
| text = '<span style="border-bottom: 1px dotted gray; cursor: help;" title="' .. output_str .. ' (БТС).">' .. text .. '</span>' | | text = '<span style="border-bottom: 1px dotted gray; cursor: help;" title="' .. output_str .. ' (БТС).">' .. text .. '</span>' |
| + | end |
| + | |
| + | -- add publishing date for a literature and lifetime for a person |
| + | local optional_lifetime ='' |
| + | if term_type == 'литература' or term_type == 'личность' then |
| + | optional_lifetime = ', '.. lifetime |
| end | | end |
| | | |
Строка 276: |
Строка 278: |
| output_str = term_without_link | | output_str = term_without_link |
| end | | end |
− | if add_origin then output_str = output_str ..' '.. origin end | + | if add_origin then |
| + | output_str = output_str ..' '.. origin |
| + | else |
| + | output_str = output_str .. optional_lifetime |
| + | end |
| if add_description then output_str = output_str ..'. – '.. description end | | if add_description then output_str = output_str ..'. – '.. description end |
| if font_grey then output_str = '<span style="color: gray;">' .. output_str..' ('.. ctd_title ..')</span>' end | | if font_grey then output_str = '<span style="color: gray;">' .. output_str..' ('.. ctd_title ..')</span>' end |
Строка 286: |
Строка 292: |
| if term_type == 'литература' or term_type == 'личность' then | | if term_type == 'литература' or term_type == 'личность' then |
| if add_link then | | if add_link then |
− | output_str = term_with_link | + | output_str = term_with_link |
| else | | else |
− | output_str = term_without_link | + | output_str = term_without_link |
| end | | end |
| + | if add_origin then |
| + | output_str = output_str ..' '.. origin |
| + | else |
| + | output_str = output_str .. ', '.. lifetime |
| + | end |
| + | if add_description then output_str = output_str ..'. – '.. description end |
| + | |
| else -- для 'понятие' и 'выражение' | | else -- для 'понятие' и 'выражение' |
| output_str = description | | output_str = description |
| + | if add_origin then output_str = output_str ..' '.. origin end |
| end | | end |
| | | |
− | if add_origin then output_str = output_str ..' '.. origin end
| |
− | if add_description then output_str = output_str ..'. – '.. description end
| |
| output_str = ' [' .. output_str .. ']' | | output_str = ' [' .. output_str .. ']' |
| if font_grey then output_str = '<span style="color: gray;">' .. output_str ..'</span>' end | | if font_grey then output_str = '<span style="color: gray;">' .. output_str ..'</span>' end |