diff options
| author | Łukasz Wilenski <wooc@gazeta.pl> | 2010-12-27 21:34:15 +0000 |
|---|---|---|
| committer | Łukasz Wilenski <wooc@gazeta.pl> | 2010-12-27 21:34:15 +0000 |
| commit | 229f98006995e762e4dd82861031212793c9d0e1 (patch) | |
| tree | 2a9f2484304f00c39095b3fdce4c28d56364c938 | |
| parent | 5c5e72e9f5d2d4339bbbbed6b58015dc48d92a98 (diff) | |
| download | webtrees-229f98006995e762e4dd82861031212793c9d0e1.tar.gz webtrees-229f98006995e762e4dd82861031212793c9d0e1.tar.bz2 webtrees-229f98006995e762e4dd82861031212793c9d0e1.zip | |
fix some source bugs
don't display IDs
add new reports
| -rw-r--r-- | includes/classes/class_reporthtml.php | 4 | ||||
| -rw-r--r-- | includes/classes/class_reportpdf.php | 11 | ||||
| -rw-r--r-- | modules/ahnentafel_report/report.xml | 110 | ||||
| -rw-r--r-- | modules/bdm_report/report.xml | 66 | ||||
| -rw-r--r-- | modules/birth_report/report.xml | 18 | ||||
| -rw-r--r-- | modules/cemetery_report/report.xml | 2 | ||||
| -rw-r--r-- | modules/change_report/report.xml | 21 | ||||
| -rw-r--r-- | modules/death_report/report.xml | 16 | ||||
| -rw-r--r-- | modules/descendancy_report/report.xml | 178 | ||||
| -rw-r--r-- | modules/family_group_report/report.xml | 564 | ||||
| -rw-r--r-- | modules/individual_ext_report/report.xml | 299 | ||||
| -rw-r--r-- | modules/individual_report/report.xml | 669 | ||||
| -rw-r--r-- | modules/marriage_report/report.xml | 12 | ||||
| -rw-r--r-- | modules/occupation_report/module.php | 63 | ||||
| -rw-r--r-- | modules/occupation_report/report.xml | 101 | ||||
| -rw-r--r-- | modules/relative_ext_report/report.xml | 27 | ||||
| -rw-r--r-- | modules/relative_report/report.xml | 17 | ||||
| -rw-r--r-- | modules/source_report/module.php | 5 | ||||
| -rw-r--r-- | modules/source_report/report_s.xml | 278 |
19 files changed, 1866 insertions, 595 deletions
diff --git a/includes/classes/class_reporthtml.php b/includes/classes/class_reporthtml.php index 40b8b09f5e..0a9eb909e6 100644 --- a/includes/classes/class_reporthtml.php +++ b/includes/classes/class_reporthtml.php @@ -630,6 +630,8 @@ class CellHTML extends Cell { return; } $temptext = str_replace("#PAGENUM#", $html->PageNo(), $this->text); + // underline title part of Source item + $temptext = str_replace(array('', ''), array('<u>', '</u>'), $temptext); // Setup the style name if ($html->getCurrentStyle() != $this->styleName) { @@ -1147,6 +1149,8 @@ class TextHTML extends Text { $html->setCurrentStyle($this->styleName); } $temptext = str_replace("#PAGENUM#", $html->PageNo(), $this->text); + // underline title part of Source item + $temptext = str_replace(array('', ''), array('<u>', '</u>'), $temptext); // If any text at all if (!empty($temptext)) { diff --git a/includes/classes/class_reportpdf.php b/includes/classes/class_reportpdf.php index ed441fc2fa..ce6ee6e503 100644 --- a/includes/classes/class_reportpdf.php +++ b/includes/classes/class_reportpdf.php @@ -661,7 +661,8 @@ class CellPDF extends Cell { $pdf->setCurrentStyle($this->styleName); } $temptext = str_replace("#PAGENUM#", $pdf->PageNo(), $this->text); - + // underline «title» part of Source item + $temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext); $match = array(); // Indicates if the cell background must be painted (1) or transparent (0) if ($this->fill == 1) { @@ -1143,7 +1144,9 @@ class TextPDF extends Text { $pdf->setCurrentStyle($this->styleName); } $temptext = str_replace("#PAGENUM#", $pdf->PageNo(), $this->text); - + // underline «title» part of Source item + $temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext); + // Paint the text color or they might use inherited colors by the previous function $match = array(); if (preg_match("/#?(..)(..)(..)/", $this->color, $match)) { @@ -1288,8 +1291,8 @@ class FootnotePDF extends Footnote { $pdf->setCurrentStyle($this->styleName); } $temptext = str_replace("#PAGENUM#", $pdf->PageNo(), $this->text); - // underline title part of Source item - $temptext = str_replace(array('', ''), array('<u>', '</u>'), $temptext); + // underline «title» part of Source item + $temptext = str_replace(array('«', '»'), array('<u>', '</u>'), $temptext); // Set the link to this y/page position $pdf->SetLink($this->addlink, -1, -1); // Print first the source number diff --git a/modules/ahnentafel_report/report.xml b/modules/ahnentafel_report/report.xml index 805f2297f5..1c838bc113 100644 --- a/modules/ahnentafel_report/report.xml +++ b/modules/ahnentafel_report/report.xml @@ -98,17 +98,32 @@ <TextBox height="12" newline="1"> <Text style="name"><GetPersonName id="" /> </Text> <if condition="$sources==1"> - <!-- Level 1 Sourcees --> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> <!-- Individual, birth... --> <Gedcom id="BIRT"> @@ -124,10 +139,12 @@ <RepeatTag tag="BIRT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -159,10 +176,12 @@ <RepeatTag tag="CHR:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -201,10 +220,12 @@ <RepeatTag tag="MARR:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -240,10 +261,46 @@ <RepeatTag tag="DEAT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + </if> + <if condition="@DATE!=''"> + <Text style="text"><var var=" " /> <GedcomValue tag="DATE" level="2" /></Text> + </if> + <if condition="@PLAC!=''"> + <Text style="text"><var var="i18n::translate(' in ')" /> <GedcomValue tag="PLAC" level="2" /></Text> + </if> + <if condition="(@desc=='Y') or (@DATE=='' and @PLAC=='')"> + <Text style="text"><var var="i18n::translate(' but the details are unknown')" /></Text> + </if> + <Text style="text">. </Text> + </Gedcom> + <Gedcom id="CREM"> + <Text style="text"><br /> + <if condition="$gender=='m'"> + <var var="i18n::translate('He was cremated')" /> + </if> + <if condition="$gender=='f'"> + <var var="i18n::translate('She was cremated')" /> + </if> + </Text> + <if condition="$sources==1"> + <RepeatTag tag="CREM:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -260,6 +317,17 @@ <Text style="text">. </Text> </Gedcom> <Gedcom id="BURI"> + <!-- Look for Level 2 CREM subordinate to BURI (should have been at Level 1) --> + <RepeatTag tag="BURI:CREM"> + <if condition="$gender=='m'"> + <var var="i18n::translate('He was cremated')" /> + </if> + <if condition="$gender=='f'"> + <var var="i18n::translate('She was cremated')" /> + </if> + <Text style="text">.</Text> + </RepeatTag> + <!-- Now for the real BURI information --> <Text style="text"> <if condition="$gender=='m'"> <var var="i18n::translate('He was buried')" /> @@ -272,10 +340,12 @@ <RepeatTag tag="BURI:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -303,7 +373,7 @@ <SetVar name="num" value="$num+1" /> </Relatives> <!-- if the sources were on, print the source citations as footnotes --> - <if condition="($sources==1) and ($source_exist==1)"> + <if condition="$source_exist==1"> <NewPage/> <TextBox width="$width" height="20" newline="1"> <Text style="subheader"><var var="i18n::translate('Sources')" /><br /><br /></Text> diff --git a/modules/bdm_report/report.xml b/modules/bdm_report/report.xml index 2965297c87..816e21b5ff 100644 --- a/modules/bdm_report/report.xml +++ b/modules/bdm_report/report.xml @@ -13,7 +13,7 @@ <Input name="birthdate2" lookup="DATE" type="text"><var var="i18n::translate('Birth Date range end')" /></Input> <Input name="deathdate1" lookup="DATE" type="text"><var var="i18n::translate('Death Date range start')" /></Input> <Input name="deathdate2" lookup="DATE" type="text"><var var="i18n::translate('Death Date range end')" /></Input> - <Input name="sortby" type="select" default="BIRT:DATE" options="ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input> + <Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input> <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input> <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input> @@ -42,14 +42,6 @@ </if> </Cell> <Cell align="rightrtl" height="10" newline="1" style="pagenum"><var var="i18n::translate('Page')" /> <PageNum /> <var var="i18n::translate('of')" /> <TotalPages /></Cell> - <!-- ID --> - <SetVar name="fill" value="" /> - <if condition="$sortby=='ID'"> - <SetVar name="fill" value="#AAAAAA" /> - </if> - <TextBox bgcolor="$fill" border="1" height="12" width="40"> - <Text style="label"></Text> - </TextBox> <!-- Name --> <SetVar name="fill" value="" /> <if condition="$sortby=='NAME'"> @@ -64,17 +56,19 @@ <SetVar name="fill" value="#AAAAAA" /> </if> <TextBox bgcolor="$fill" border="1" height="12" width="165"> - <!-- todo: do not print [-] if no dates are selected --> <Text style="label"> - <var var="i18n::translate('Birth')" /> [ - <if condition="$birthdate1!=''"> - <var var="birthdate1" /> - </if> - - - <if condition="$birthdate2!=''"> - <var var="birthdate2" /> + <var var="i18n::translate('Birth')" /> + <if condition="$birthdate1!='' or $birthdate2!=''"> + [ + <if condition="$birthdate1!=''"> + <var var="birthdate1" /> + </if> + - + <if condition="$birthdate2!=''"> + <var var="birthdate2" /> + </if> + ] </if> - ] </Text> </TextBox> <!-- Marrige --> @@ -91,17 +85,19 @@ <SetVar name="fill" value="#AAAAAA" /> </if> <TextBox bgcolor="$fill" border="1" height="12" newline="1"> - <!-- todo: do not print [-] if no dates are selected --> <Text style="label"> - <var var="i18n::translate('Death')" /> [ - <if condition="$deathdate1!=''"> - <var var="deathdate1" /> + <var var="i18n::translate('Death')" /> + <if condition="$deathdate1!='' or $deathdate2!=''"> + [ + <if condition="$deathdate1!=''"> + <var var="deathdate1" /> + </if> + - + <if condition="$deathdate2!=''"> + <var var="deathdate2" /> + </if> + ] </if> - - - <if condition="$deathdate2!=''"> - <var var="deathdate2" /> - </if> - ] </Text> </TextBox> </Header> @@ -116,12 +112,6 @@ <List list="individual" filter1="$filter1" filter2="BIRT:DATE GTE $birthdate1" filter3="BIRT:DATE LTE $birthdate2" filter4="DEAT:DATE GTE $deathdate1" filter5="DEAT:DATE LTE $deathdate2" filter6="NAME CONTAINS $name" sortby="$sortby"> <SetVar name="spid" value="@ID" /> - <TextBox width="40" height="46"> - <Text style="text"> - <GedcomValue tag="@id" /> - </Text> - </TextBox> - <TextBox width="205" height="46"> <Text style="text"> <GetPersonName id="" /> @@ -134,7 +124,7 @@ </Text> </TextBox> - <TextBox width="165" height="46" border="1"> + <TextBox width="165" height="46" border="0"> <SetVar name="moreB" value="0" /> <Text style="small"> <RepeatTag tag="BIRT"> @@ -156,14 +146,14 @@ </Text> </TextBox> - <TextBox width="165" height="46" border="1"> + <TextBox width="165" height="46" border="0"> <SetVar name="more" value="0" /> <RepeatTag tag="FAMS"> <Text style="small"> <Gedcom id="@FAMS"> <if condition="$more==1"> <br /> - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + --------------------------- <br /> </if> <!-- todo: print the dates, places and sources of all the FAM MARR records --> @@ -192,7 +182,7 @@ </RepeatTag> </TextBox> - <TextBox border="1" height="46" newline="1"> + <TextBox border="0" height="46" newline="1"> <SetVar name="moreD" value="0" /> <Text style="small"> <RepeatTag tag="DEAT"> @@ -217,7 +207,7 @@ </RepeatTag> </Text> </TextBox> - + <Line /> </List> <Cell align="rightrtl" height="24" newline="1" style="label"><br /> diff --git a/modules/birth_report/report.xml b/modules/birth_report/report.xml index cb8dd18e6f..b94f7e507f 100644 --- a/modules/birth_report/report.xml +++ b/modules/birth_report/report.xml @@ -7,7 +7,7 @@ <Input name="birthplace" lookup="PLAC" type="text"><var var="i18n::translate('Birth Place contains')" /></Input> <Input name="birthdate1" lookup="DATE" type="text"><var var="i18n::translate('Birth Date range start')" /></Input> <Input name="birthdate2" lookup="DATE" type="text"><var var="i18n::translate('Birth Date range end')" /></Input> - <Input name="sortby" type="select" default="NAME" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')"><var var="i18n::translate('Sort by')" /></Input> + <Input name="sortby" type="select" default="NAME" options="none=>i18n::translate('None')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')"><var var="i18n::translate('Sort by')" /></Input> <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input> <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input> @@ -30,30 +30,34 @@ <Cell align="rightrtl" newline="1" style="pagenum"><var var="i18n::translate('Page')" /> <PageNum /> <var var="i18n::translate('of')" /> <TotalPages /></Cell> <SetVar name="fill" value="" /> - <if condition="($sortby=='NAME') or ($sortby=='ID')"><SetVar name="fill" value="#AAAAAA" /></if> + <if condition="$sortby=='NAME'"><SetVar name="fill" value="#AAAAAA" /></if> <Cell bgcolor="$fill" border="1" width="200" style="label"><var var="i18n::translate('Name')" /></Cell> <SetVar name="fill" value="" /> <if condition="$sortby=='BIRT:DATE'"><SetVar name="fill" value="#AAAAAA" /></if> <Cell bgcolor="$fill" border="1" width="100" style="label"><var var="i18n::translate('Date')" /></Cell> - <Cell border="1" width="225" style="label"><var var="i18n::translate('Place')" /></Cell> + <Cell border="1" width="150" style="label"><var var="i18n::translate('Place')" /></Cell> <Cell border="1" newline="1" style="label"><var var="i18n::translate('Source')" /></Cell> </Header> <Body> <List list="individual" filter1="BIRT:PLAC CONTAINS $birthplace" filter2="BIRT:DATE GTE $birthdate1" filter3="BIRT:DATE LTE $birthdate2" filter4="NAME CONTAINS $name" sortby="$sortby"> - <Cell width="200" style="text"><GetPersonName id="" /> - (<GedcomValue tag="@id" />)</Cell> + <Cell width="200" style="text"><GetPersonName id="" /></Cell> <Cell width="100" style="text"><GedcomValue tag="BIRT:DATE" newline="1" /></Cell> - <Cell width="225" style="text"><GedcomValue tag="BIRT:PLAC" /></Cell> + <Cell width="150" style="text"><GedcomValue tag="BIRT:PLAC" /></Cell> <Cell newline="1" style="text"> <!-- Only with multiple sources use line feed (br) --> <SetVar name="usebr" value="0"/> <RepeatTag tag="BIRT:SOUR"> - <if condition="$usebr==1"><br /></if> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="$usebr==1"><br /></if> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> <SetVar name="usebr" value="1"/> </RepeatTag> </Cell> diff --git a/modules/cemetery_report/report.xml b/modules/cemetery_report/report.xml index ce316400df..aa3f6c507f 100644 --- a/modules/cemetery_report/report.xml +++ b/modules/cemetery_report/report.xml @@ -64,7 +64,7 @@ </Header> <Body> <List list="individual" filter1="BURI:PLAC CONTAINS $deathplace" sortby="$sortby"> - <Cell style="text" width="$namewidth"><GetPersonName id="" /> - (<GedcomValue tag="@id" />) + <Cell style="text" width="$namewidth"><GetPersonName id="" /> <if condition="$adlist=='_MARNM'"> <RepeatTag tag="NAME:_MARNM"> <br /><GedcomValue tag="_MARNM" /> diff --git a/modules/change_report/report.xml b/modules/change_report/report.xml index 088a8415e1..6e0234e1d1 100644 --- a/modules/change_report/report.xml +++ b/modules/change_report/report.xml @@ -27,15 +27,13 @@ <if condition="$pageorient=='landscape'"> <!-- landscape orientation --> - <SetVar name="idwidth" value="50"/> - <SetVar name="namewidth" value="220"/> + <SetVar name="namewidth" value="270"/> <SetVar name="datewidth" value="300"/> </if> <if condition="$pageorient=='portrait'"> <!-- portrait orientation --> - <SetVar name="idwidth" value="40"/> - <SetVar name="namewidth" value="170"/> + <SetVar name="namewidth" value="210"/> <SetVar name="datewidth" value="190"/> </if> @@ -50,10 +48,6 @@ <!-- Pending changes section Header --> <if condition="$pending=='yes'"> <Cell align="center" height="20" newline="1" style="header2"><var var="i18n::translate('Pending changes')" /></Cell> - <TextBox border="1" height="12" width="$idwidth"> - <Text style="label"> </Text> - </TextBox> - <SetVar name="fill" value="" /> <if condition="$sortby=='NAME'"><SetVar name="fill" value="#AAAAAA" /></if> <TextBox bgcolor="$fill" border="1" height="12" width="$namewidth"> @@ -72,9 +66,6 @@ <!-- Pending Changes Section Data --> <List list="pending" sortby="$sortby"> - <TextBox height="12" width="$idwidth"> - <Text style="text"><GedcomValue tag="@id" /></Text> - </TextBox> <TextBox height="12" width="$namewidth"> <Text style="text"><GetPersonName id="" /></Text> </TextBox> @@ -97,10 +88,6 @@ <!-- Recent Changes Section Header --> <Cell align="center" height="20" newline="1" style="header2"><var var="i18n::translate('Recent changes')" /> <var var="changeRangeStart" date="1" /> - <var var="changeRangeEnd" date="1" /></Cell> - <TextBox border="1" height="12" width="$idwidth"> - <Text style="label"> </Text> - </TextBox> - <SetVar name="fill" value="" /> <if condition="$sortby=='NAME'"><SetVar name="fill" value="#AAAAAA" /></if> <TextBox bgcolor="$fill" border="1" height="12" width="$namewidth"> @@ -121,10 +108,6 @@ <!-- Recent Changes Section Data --> <List list="individual" filter1="CHAN:DATE LTE $changeRangeEnd" filter2="CHAN:DATE GTE $changeRangeStart" sortby="$sortby"> - <TextBox height="12" width="$idwidth"> - <Text style="text"><GedcomValue tag="@id" /></Text> - </TextBox> - <TextBox height="12" width="$namewidth"> <Text style="text"><GetPersonName id="" /></Text> </TextBox> diff --git a/modules/death_report/report.xml b/modules/death_report/report.xml index d2c23074b2..1c922eabd1 100644 --- a/modules/death_report/report.xml +++ b/modules/death_report/report.xml @@ -7,7 +7,7 @@ <Input name="deathplace" lookup="PLAC" type="text"><var var="i18n::translate('Death Place contains')" /></Input> <Input name="deathdate1" lookup="DATE" type="text"><var var="i18n::translate('Death Date range start')" /></Input> <Input name="deathdate2" lookup="DATE" type="text"><var var="i18n::translate('Death Date range end')" /></Input> - <Input name="sortby" type="select" default="NAME" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input> + <Input name="sortby" type="select" default="NAME" options="none=>i18n::translate('None')|NAME=>i18n::translate('Name')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input> <Input name="adlist" type="select" default="none" options="none=>i18n::translate('None')|_MARNM=>translate_fact('_MARNM')|HUSB=>i18n::translate('Husband')"><var var="i18n::translate('Name List')" /></Input> <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input> <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input> @@ -31,7 +31,7 @@ <Cell align="rightrtl" newline="1" style="pagenum"><var var="i18n::translate('Page')" /> <PageNum /> <var var="i18n::translate('of')" /> <TotalPages /></Cell> <SetVar name="fill" value="" /> - <if condition="($sortby=='NAME') or ($sortby=='ID')"><SetVar name="fill" value="#AAAAAA" /></if> + <if condition="$sortby=='NAME'"><SetVar name="fill" value="#AAAAAA" /></if> <TextBox bgcolor="$fill" border="1" width="200"> <Text style="label"><var var="i18n::translate('Name')" /></Text> </TextBox> @@ -44,7 +44,7 @@ <Text style="label"><var var="i18n::translate('Date')" /></Text> </TextBox> - <TextBox border="1" width="225"> + <TextBox border="1" width="150"> <Text style="label"><var var="i18n::translate('Place')" /></Text> </TextBox> @@ -56,7 +56,7 @@ <Body> <List list="individual" filter1="DEAT:PLAC CONTAINS $deathplace" filter2="DEAT:DATE GTE $deathdate1" filter3="DEAT:DATE LTE $deathdate2" filter4="NAME CONTAINS $name" sortby="$sortby"> <TextBox width="200"> - <Text style="text"><GetPersonName id="" /> - (<GedcomValue tag="@id" />) + <Text style="text"><GetPersonName id="" /> <if condition="$adlist=='_MARNM'"> <RepeatTag tag="NAME:_MARNM"> <br /><GedcomValue tag="_MARNM" /> @@ -74,7 +74,7 @@ <TextBox width="100"> <Text style="text"><GedcomValue tag="DEAT:DATE" newline="1" /></Text> </TextBox> - <TextBox width="225"> + <TextBox width="150"> <Text style="text"><GedcomValue tag="DEAT:PLAC" /></Text> </TextBox> <TextBox newline="1"> @@ -84,8 +84,12 @@ <RepeatTag tag="DEAT:SOUR"> <Gedcom id="@SOUR"> <if condition="$usebr==1"><br /></if> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> <SetVar name="usebr" value="1"/> </RepeatTag> </Text> diff --git a/modules/descendancy_report/report.xml b/modules/descendancy_report/report.xml index f78b6b8574..9c4edf59ae 100644 --- a/modules/descendancy_report/report.xml +++ b/modules/descendancy_report/report.xml @@ -60,16 +60,32 @@ <TextBox border="" height="40" newline="1"> <Text style="name"><GetPersonName id="" /> </Text> <!-- main --> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> <SetVar name="printPeriod" value="false" /> <if condition="@SEX=='M'"> @@ -92,10 +108,12 @@ <RepeatTag tag="BIRT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -122,10 +140,12 @@ <RepeatTag tag="DEAT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -139,9 +159,9 @@ </Gedcom> <if condition="$printPeriod=='true'"> <Text style="label1">.</Text> + <SetVar name="printPronoun" value="true" /> </if> <RepeatTag tag="FAMS"> - <SetVar name="printPronoun" value="$printPeriod" /> <SetVar name="printPeriod" value="false" /> <Gedcom id="@FAMS"> <SetVar name="marrExists" value="false" /> @@ -159,10 +179,12 @@ <RepeatTag tag="MARR:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -171,18 +193,34 @@ <if condition="$marrExists=='true'"> <Gedcom id="@WIFE"> <Text style="name"> <GetPersonName id="" /> </Text> -<!-- wife --> <if condition="$sources==1"> - <RepeatTag tag="SOUR"> - <Footnote> - <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> - </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> - </Footnote> - <SetVar name="source_exist" value="1"/> - </RepeatTag> - </if> +<!-- wife --> <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> + </if> <Gedcom id="@FAMC"> <Text style="label1"> <var var="i18n::translate('daughter of')" /></Text> <Text style="name"> <GetPersonName id="@HUSB" /> </Text> @@ -210,10 +248,12 @@ <RepeatTag tag="MARR:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -223,16 +263,32 @@ <Gedcom id="@HUSB"> <Text style="name"> <GetPersonName id="" /> </Text> <!-- husband --> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> <Gedcom id="@FAMC"> <Text style="label1"> <var var="i18n::translate('son of')" /></Text> @@ -260,6 +316,7 @@ </Gedcom> <if condition="$printPeriod=='true'"> <Text style="label1">.</Text> + <SetVar name="printPronoun" value="true" /> </if> <if condition="$marrExists=='true'"> <if condition="$gender=='male'"> @@ -278,10 +335,12 @@ <RepeatTag tag="BIRT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -307,10 +366,12 @@ <RepeatTag tag="DEAT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -324,6 +385,7 @@ </Gedcom> <if condition="$printPeriod=='true'"> <Text style="label1">.</Text> + <SetVar name="printPronoun" value="true" /> </if> </Gedcom> </if> @@ -343,10 +405,12 @@ <RepeatTag tag="BIRT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -372,10 +436,12 @@ <RepeatTag tag="DEAT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE" level="3"/> <GedcomValue tag="DATA:TEXT" level="3"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -389,6 +455,7 @@ </Gedcom> <if condition="$printPeriod=='true'"> <Text style="label1">.</Text> + <SetVar name="printPronoun" value="true" /> </if> </Gedcom> </if> @@ -460,16 +527,32 @@ <Text style="label1"><var var="familyChildRoman" /></Text> <Text style="name"> <GetPersonName id="" /> </Text> <!-- children --> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> <Gedcom id="BIRT"> <Text style="label1"> <varLetter var="BIRT" />: <GedcomValue tag="DATE" level="2"/> <GedcomValue tag="PLAC" level="2"/></Text> @@ -521,7 +604,8 @@ <TextBox height="10" newline="1" padding="0"/> </if> </Relatives> - <if condition="($sources==1) and ($source_exist==1)"> + <!-- if the sources were on, print the source citations as footnotes --> + <if condition="$source_exist==1"> <NewPage/> <TextBox newline="1"> <Text style="subheader"><var var="i18n::translate('Sources')" /><br /><br /></Text> diff --git a/modules/family_group_report/report.xml b/modules/family_group_report/report.xml index 73880dd8a4..639601da27 100644 --- a/modules/family_group_report/report.xml +++ b/modules/family_group_report/report.xml @@ -7,12 +7,11 @@ <Input name="famid" lookup="FAM" type="text" default=""><var var="i18n::translate('Enter Family ID')" /></Input> <Input name="sources" type="checkbox" default="1"><var var="i18n::translate('Show sources?')" /></Input> <Input name="notes" type="checkbox" default="1"><var var="i18n::translate('Show notes?')" /></Input> - <Input name="photos" type="checkbox" default="0"><var var="i18n::translate('Show photos?')" /></Input> + <Input name="photos" type="checkbox" default="1"><var var="i18n::translate('Show photos?')" /></Input> <Input name="blanks" type="checkbox" default="0"><var var="i18n::translate('Print basic events when blank?')" /></Input> <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input> <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input> <Input name="colors" type="checkbox" default="1"><var var="i18n::translate('Use colors')"/></Input> - <Input name="showplace" type="checkbox" default="1"><var var="i18n::translate('Print')"/> "<var var="i18n::translate('Place')" />"?</Input> <!-- Header --> <Style name="header" font="$fonts" size="18" /> @@ -35,13 +34,7 @@ <!-- Date --> <Style name="date" font="$fonts" size="8"/> - <!-- if the option to show blanks is selected then ignore the MARR, BIRT etc facts that are printed with the blanks --> - <if condition="$blanks==1"> - <SetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,MARR,BIRT,CHR,DEAT,BURI,_UID,_WT_OBJE_SORT" /> - </if> - <if condition="$blanks!=1"> - <SetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,_UID,_WT_OBJE_SORT" /> - </if> + <SetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,RESN,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,MARR,BIRT,CHR,BAPM,DEAT,CREM,BURI,_UID,_WT_OBJE_SORT" /> <!-- Setup colors --> <!-- Section title background color --> <SetVar name="sectionbox_bgcolor" value="#AAAAAA"/> @@ -100,16 +93,32 @@ <TextBox newline="1"> <Text style="pageheader"><var var="i18n::translate('Family')" /> <GetPersonName id=""/> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> </TextBox> @@ -133,21 +142,37 @@ <Text color="$tcolor" style="text"><var var="i18n::translate('Husband')" /> </Text> <Text color="$tcolor" style="name"><GetPersonName id="" /> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> </TextBox> - <!-- print the birth and christening if the blanks are on --> - <if condition="$blanks==1"> + <if condition="$blanks==1 or @BIRT:DATE!='' or @BIRT:PLAC!=''"> + <!-- print Birth --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Birth')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="BIRT:DATE" /> </Text> @@ -155,22 +180,23 @@ <RepeatTag tag="BIRT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="BIRT:PLAC" /></Text> </TextBox> - + </if> + <if condition="$blanks==1 or @CHR:DATE!='' or @CHR:PLAC!=''"> + <!-- print Christening --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Christening')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="CHR:DATE" /> </Text> @@ -178,19 +204,18 @@ <RepeatTag tag="CHR:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="CHR:PLAC" /></Text> </TextBox> </if> @@ -204,10 +229,12 @@ <RepeatTag tag="@fact:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -216,15 +243,20 @@ <if condition="@desc!=''"> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> <Text color="$tcolor" style="text"> - <GedcomValue tag="@desc" /> <GedcomValue tag="@fact:PLAC" /> <GedcomValue tag="@fact:TEMP" /> + <if condition="@desc=='Y'"> + <var var="i18n::translate('Yes')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc=='N'"> + <var var="i18n::translate('No')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc!='Y' and @desc!='N'"> + <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> + </if> </Text> </TextBox> </if> <if condition="@desc==''"> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"> <GedcomValue tag="@fact:PLAC" /> <GedcomValue tag="@fact:TEMP" /> </Text> @@ -232,8 +264,8 @@ </if> </Facts> - <!-- put the death and burial info if blanks are on --> - <if condition="$blanks==1"> + <if condition="$blanks==1 or @DEAT:DATE!='' or @DEAT:PLAC!=''"> + <!-- print Death --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Death')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="DEAT:DATE" /> </Text> @@ -241,22 +273,61 @@ <RepeatTag tag="DEAT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="DEAT:PLAC" /></Text> </TextBox> - + </if> + <!-- indicates that a Level 1 CREM record is not present --> + <SetVar name="level1CREM" value="0" /> + <if condition="$blanks==1 or @CREM:DATE!='' or @CREM:PLAC!=''"> + <!-- print Cremation --> + <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> + <Text color="$tcolor" style="fact"><var var="translate_fact('CREM')" /> </Text> + <Text color="$tcolor" style="text"><GedcomValue tag="CREM:DATE" /> </Text> + <if condition="$sources==1"> + <RepeatTag tag="CREM:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + </if> + </TextBox> + <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> + <Text color="$tcolor" style="text"><GedcomValue tag="CREM:PLAC" /></Text> + </TextBox> + <!-- indicates that a Level 1 CREM record is present --> + <SetVar name="level1CREM" value="1" /> + </if> + <if condition="$blanks==1 or @BURI:CREM!='' or @BURI:DATE!='' or @BURI:PLAC!=''"> + <!-- Look for Level 2 CREM subordinate to BURI (should have been at Level 1) --> + <if condition="@BURI:CREM!='' and $level1CREM!=1"> + <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> + <Text color="$tcolor" style="fact"><var var="translate_fact('CREM')" /> </Text> + <Text color="$tcolor" style="text"> </Text> + </TextBox> + <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> + <Text color="$tcolor" style="text"> </Text> + </TextBox> + </if> + <!-- Now for the real BURI information --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Burial')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="BURI:DATE" /> </Text> @@ -264,26 +335,25 @@ <RepeatTag tag="BURI:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="BURI:PLAC" /></Text> </TextBox> </if> <Gedcom id="$famid"> - <!-- put the marriage info if blanks are on --> - <if condition="$blanks==1"> + <if condition="$blanks==1 or @MARR:DATE!='' or @MARR:PLAC!=''"> + <!-- print Marriage --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Marriage')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="MARR:DATE" /> </Text> @@ -291,19 +361,18 @@ <RepeatTag tag="MARR:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="MARR:PLAC" /></Text> </TextBox> </if> @@ -317,10 +386,12 @@ <RepeatTag tag="@fact:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -329,15 +400,20 @@ <if condition="@desc!=''"> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> <Text color="$tcolor" style="text"> - <GedcomValue tag="@desc" /> <GedcomValue tag="@fact:PLAC" /> <GedcomValue tag="@fact:TEMP" /> + <if condition="@desc=='Y'"> + <var var="i18n::translate('Yes')" /> <GedcomValue tag="@fact:PLAC"/> <GedcomValue tag="@fact:TEMP" /> + </if> + <if condition="@desc=='N'"> + <var var="i18n::translate('No')" /> <GedcomValue tag="@fact:PLAC"/> <GedcomValue tag="@fact:TEMP" /> + </if> + <if condition="@desc!='Y' and @desc!='N'"> + <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> <GedcomValue tag="@fact:TEMP" /> + </if> </Text> </TextBox> </if> <if condition="@desc==''"> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"> <GedcomValue tag="@fact:PLAC" /> <GedcomValue tag="@fact:TEMP" /> </Text> @@ -352,14 +428,14 @@ <Text color="$tcolor" style="fact"><var var="i18n::translate('Father')" /> </Text> <Text color="$tcolor" style="name"><GetPersonName id="@HUSB" /></Text> <Gedcom id="@HUSB"> - <Text color="$tcolor" style="text"> (<varLetter var="BIRT" />: <GedcomValue tag="BIRT:DATE" /> - <varLetter var="DEAT" />: <GedcomValue tag="DEAT:DATE" />)</Text> + <Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text> </Gedcom> </TextBox> <TextBox bgcolor="$femalebox_bgcolor" border="1" left="15" width="$width1" newline="1"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Mother')" /> </Text> <Text color="$tcolor" style="name"><GetPersonName id="@WIFE" /></Text> <Gedcom id="@WIFE"> - <Text color="$tcolor" style="text"> (<varLetter var="BIRT" />: <GedcomValue tag="BIRT:DATE" /> - <varLetter var="DEAT" />: <GedcomValue tag="DEAT:DATE" />)</Text> + <Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text> </Gedcom> </TextBox> </Gedcom> @@ -383,21 +459,37 @@ <Text color="$tcolor" style="text"><var var="i18n::translate('Wife')" /> </Text> <Text color="$tcolor" style="name"><GetPersonName id="" /> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> </TextBox> - <!-- print the birth and christening with blanks on --> - <if condition="$blanks==1"> + <if condition="$blanks==1 or @BIRT:DATE!='' or @BIRT:PLAC!=''"> + <!-- print Birth --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Birth')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="BIRT:DATE" /> </Text> @@ -405,22 +497,23 @@ <RepeatTag tag="BIRT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="BIRT:PLAC" /></Text> </TextBox> - + </if> + <if condition="$blanks==1 or @CHR:DATE!='' or @CHR:PLAC!=''"> + <!-- print Christening --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Christening')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="CHR:DATE" /> </Text> @@ -428,22 +521,22 @@ <RepeatTag tag="CHR:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="CHR:PLAC" /></Text> </TextBox> </if> + <!-- print all of the other facts --> <Facts ignore="$ignore"> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> @@ -453,10 +546,12 @@ <RepeatTag tag="@fact:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -465,24 +560,29 @@ <if condition="@desc!=''"> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> <Text color="$tcolor" style="text"> - <GedcomValue tag="@desc" /> <GedcomValue tag="@fact:PLAC" /> <GedcomValue tag="@fact:TEMP" /> + <if condition="@desc=='Y'"> + <var var="i18n::translate('Yes')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc=='N'"> + <var var="i18n::translate('No')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc!='Y' and @desc!='N'"> + <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> + </if> </Text> </TextBox> </if> <if condition="@desc==''"> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"> <GedcomValue tag="@fact:PLAC" /> <GedcomValue tag="@fact:TEMP" /> </Text> </TextBox> </if> </Facts> - - <!-- print the death and burial with blanks on --> - <if condition="$blanks==1"> + + <if condition="$blanks==1 or @DEAT:DATE!='' or @DEAT:PLAC!=''"> + <!-- print Death --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Death')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="DEAT:DATE" /> </Text> @@ -490,22 +590,61 @@ <RepeatTag tag="DEAT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="DEAT:PLAC" /></Text> </TextBox> - + </if> + <!-- indicates that a Level 1 CREM record is not present --> + <SetVar name="level1CREM" value="0" /> + <if condition="$blanks==1 or @CREM:DATE!='' or @CREM:PLAC!=''"> + <!-- print Cremation --> + <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> + <Text color="$tcolor" style="fact"><var var="translate_fact('CREM')" /> </Text> + <Text color="$tcolor" style="text"><GedcomValue tag="CREM:DATE" /> </Text> + <if condition="$sources==1"> + <RepeatTag tag="CREM:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + </if> + </TextBox> + <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> + <Text color="$tcolor" style="text"><GedcomValue tag="CREM:PLAC" /></Text> + </TextBox> + <!-- indicates that a Level 1 CREM record is present --> + <SetVar name="level1CREM" value="1" /> + </if> + <if condition="$blanks==1 or @BURI:CREM!='' or @BURI:DATE!='' or @BURI:PLAC!=''"> + <!-- Look for Level 2 CREM subordinate to BURI (should have been at Level 1) --> + <if condition="@BURI:CREM!='' and $level1CREM!=1"> + <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> + <Text color="$tcolor" style="fact"><var var="translate_fact('CREM')" /> </Text> + <Text color="$tcolor" style="text"> </Text> + </TextBox> + <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> + <Text color="$tcolor" style="text"> </Text> + </TextBox> + </if> + <!-- Now for the real BURI information --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Burial')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="BURI:DATE" /> </Text> @@ -513,19 +652,18 @@ <RepeatTag tag="BURI:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="BURI:PLAC" /></Text> </TextBox> </if> @@ -536,14 +674,14 @@ <Text color="$tcolor" style="fact"><var var="i18n::translate('Father')" /> </Text> <Text color="$tcolor" style="name"><GetPersonName id="@HUSB" /></Text> <Gedcom id="@HUSB"> - <Text color="$tcolor" style="text"> (<varLetter var="BIRT" />: <GedcomValue tag="BIRT:DATE" /> - <varLetter var="DEAT" />: <GedcomValue tag="DEAT:DATE" />)</Text> + <Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text> </Gedcom> </TextBox> <TextBox bgcolor="$femalebox_bgcolor" border="1" left="15" width="$width1" newline="1"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Mother')" /> </Text> <Text color="$tcolor" style="name"><GetPersonName id="@WIFE" /></Text> <Gedcom id="@WIFE"> - <Text color="$tcolor" style="text"> (<varLetter var="BIRT" />: <GedcomValue tag="BIRT:DATE" /> - <varLetter var="DEAT" />: <GedcomValue tag="DEAT:DATE" />)</Text> + <Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text> </Gedcom> </TextBox> </Gedcom> @@ -577,16 +715,32 @@ <Text color="$tcolor" style="text"><var var="i18n::translate('Son')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id="" /> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> </TextBox> </if> @@ -596,16 +750,32 @@ <Text color="$tcolor" style="text"><var var="i18n::translate('Daughter')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id="" /> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> </TextBox> </if> @@ -615,22 +785,38 @@ <Text color="$tcolor" style="text"><var var="i18n::translate('Gender')"/> <var var="i18n::translate_c('unknown gender', 'Unknown')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id="" /> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> </TextBox> </if> - <!-- print the birth and christenting when blanks are on --> - <if condition="$blanks==1"> + <if condition="$blanks==1 or @BIRT:DATE!='' or @BIRT:PLAC!=''"> + <!-- print Birth --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Birth')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="BIRT:DATE" /> </Text> @@ -638,22 +824,23 @@ <RepeatTag tag="BIRT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="BIRT:PLAC" /></Text> </TextBox> - + </if> + <if condition="$blanks==1 or @CHR:DATE!='' or @CHR:PLAC!=''"> + <!-- print Christening --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Christening')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="CHR:DATE" /> </Text> @@ -661,24 +848,23 @@ <RepeatTag tag="CHR:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="CHR:PLAC" /></Text> </TextBox> </if> - <!-- print the rest of the facts --> + <!-- print all of the other facts --> <Facts ignore="$ignore"> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="@fact" /> </Text> @@ -687,10 +873,12 @@ <RepeatTag tag="@fact:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> @@ -698,31 +886,30 @@ </TextBox> <if condition="@desc!=''"> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="@_PGVS!=''"> - <Text color="$tcolor" style="name"><GetPersonName id="@_PGVS" /> </Text> - </if> <Text color="$tcolor" style="text"> - <GedcomValue tag="@desc" /> <GedcomValue tag="@fact:PLAC" /> + <if condition="@desc=='Y'"> + <var var="i18n::translate('Yes')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc=='N'"> + <var var="i18n::translate('No')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc!='Y' and @desc!='N'"> + <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> + </if> </Text> </TextBox> </if> <if condition="@desc==''"> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="@_PGVS!=''"> - <Text color="$tcolor" style="name"><GetPersonName id="@_PGVS" /> </Text> - </if> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"> <GedcomValue tag="@fact:PLAC" /> <GedcomValue tag="@fact:TEMP" /> </Text> </TextBox> </if> </Facts> - - <!-- print the death and burial with blanks on --> - <if condition="$blanks==1"> + + <if condition="$blanks==1 or @DEAT:DATE!='' or @DEAT:PLAC!=''"> + <!-- print Death --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Death')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="DEAT:DATE" /> </Text> @@ -730,22 +917,61 @@ <RepeatTag tag="DEAT:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="DEAT:PLAC" /></Text> </TextBox> - + </if> + <!-- indicates that a Level 1 CREM record is not present --> + <SetVar name="level1CREM" value="0" /> + <if condition="$blanks==1 or @CREM:DATE!='' or @CREM:PLAC!=''"> + <!-- print Cremation --> + <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> + <Text color="$tcolor" style="fact"><var var="translate_fact('CREM')" /> </Text> + <Text color="$tcolor" style="text"><GedcomValue tag="CREM:DATE" /> </Text> + <if condition="$sources==1"> + <RepeatTag tag="CREM:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + </if> + </TextBox> + <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> + <Text color="$tcolor" style="text"><GedcomValue tag="CREM:PLAC" /></Text> + </TextBox> + <!-- indicates that a Level 1 CREM record is present --> + <SetVar name="level1CREM" value="1" /> + </if> + <if condition="$blanks==1 or @BURI:CREM!='' or @BURI:DATE!='' or @BURI:PLAC!=''"> + <!-- Look for Level 2 CREM subordinate to BURI (should have been at Level 1) --> + <if condition="@BURI:CREM!='' and $level1CREM!=1"> + <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> + <Text color="$tcolor" style="fact"><var var="translate_fact('CREM')" /> </Text> + <Text color="$tcolor" style="text"> </Text> + </TextBox> + <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> + <Text color="$tcolor" style="text"> </Text> + </TextBox> + </if> + <!-- Now for the real BURI information --> <TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth"> <Text color="$tcolor" style="fact"><var var="i18n::translate('Burial')" /> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="BURI:DATE" /> </Text> @@ -753,19 +979,18 @@ <RepeatTag tag="BURI:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> </if> </TextBox> <TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1"> - <if condition="$showplace==1"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')" /> </Text> - </if> <Text color="$tcolor" style="text"><GedcomValue tag="BURI:PLAC" /></Text> </TextBox> </if> @@ -780,7 +1005,7 @@ <Text color="$tcolor" style="fact"><var var="i18n::translate('Wife')" /> </Text> <Text color="$tcolor" style="name"><GetPersonName id="@WIFE" /></Text> <Gedcom id="@WIFE"> - <Text color="$tcolor" style="text"> (<varLetter var="BIRT" />: <GedcomValue tag="BIRT:DATE" /> - <varLetter var="DEAT" />: <GedcomValue tag="DEAT:DATE" />)</Text> + <Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text> </Gedcom> </TextBox> </if> @@ -789,7 +1014,7 @@ <Text color="$tcolor" style="fact"><var var="i18n::translate('Husband')" /> </Text> <Text color="$tcolor" style="name"><GetPersonName id="@HUSB" /></Text> <Gedcom id="@HUSB"> - <Text color="$tcolor" style="text"> (<varLetter var="BIRT" />: <GedcomValue tag="BIRT:DATE" /> - <varLetter var="DEAT" />: <GedcomValue tag="DEAT:DATE" />)</Text> + <Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text> </Gedcom> </TextBox> </if> @@ -814,7 +1039,8 @@ <!-- end of main family gedcom --> <!-- if the sources were on, print the source citations as footnotes --> - <if condition="($sources==1) and ($source_exist==1)"> + <if condition="$source_exist==1"> + <NewPage /> <TextBox newline="1" width="$width"> <Text style="pageheader"><br /><var var="i18n::translate('Sources')" /><br /><br /></Text> <FootnoteTexts /> diff --git a/modules/individual_ext_report/report.xml b/modules/individual_ext_report/report.xml index 3d76eed664..08d8cf585c 100644 --- a/modules/individual_ext_report/report.xml +++ b/modules/individual_ext_report/report.xml @@ -7,7 +7,7 @@ <Input name="relatives" type="select" options="child-family=>i18n::translate('Parents and siblings')|spouse-family=>i18n::translate('Spouses and children')|direct-ancestors=>i18n::translate('Direct line ancestors')|ancestors=>i18n::translate('Direct line ancestors and their families')|descendants=>i18n::translate('Descendants')|all=>i18n::translate('All')"><var var="i18n::translate('Choose relatives')"/></Input> <Input name="maxgen" type="select" default="4" options="*=>*|1=>1|2=>2|3=>3|4=>4|5=>5|6=>6|7=>7|8=>8|9=>9|10=>10"><var var="i18n::translate('Generations')"/></Input> <Input name="sortby" type="select" default="BIRT:DATE" options="none=>i18n::translate('None')|BIRT:DATE=>i18n::translate('Date of birth')|NAME=>i18n::translate('Name')"><var var="i18n::translate('Sort by')"/></Input> - <Input name="sources" type="checkbox" default="0"><var var="i18n::translate('Show sources?')"/></Input> + <Input name="sources" type="checkbox" default="1"><var var="i18n::translate('Show sources?')"/></Input> <Input name="notes" type="checkbox" default="1"><var var="i18n::translate('Show notes?')"/></Input> <Input name="photos" type="select" default="highlighted" options="none=>i18n::translate('None')|all=>i18n::translate('All')|highlighted=>i18n::translate('Highlighted image')"><var var="i18n::translate('Show photos?')"/></Input> <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input> @@ -99,19 +99,35 @@ <SetVar name="newpage" value="1"/> <SetVar name="sex" value="@SEX"/> <SetVar name="mid" value="@ID"/> - <!-- Individual name with LEVEL 1 source--> + <!-- Individual name --> <TextBox newline="1"> <Text style="pageheader"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> </TextBox> @@ -138,18 +154,18 @@ <Text color="$tcolor" style="fact"><var var="@fact"/> </Text> <Text color="$tcolor" style="text"><GedcomValue tag="@fact:DATE"/> </Text> <!-- look for fact level 2 sources --> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> <RepeatTag tag="@fact:SOUR"> - <SetVar name="source_exist" value="1"/> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <!-- Source text to footnotes --> - <if condition="@PAGE!=''">: </if> - <!-- Additional Details of the source --> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> </TextBox> @@ -157,7 +173,15 @@ <if condition="@desc!=''"> <TextBox bgcolor="$fbbgcolor" border="1" newline="1" width="$width2"> <Text color="$tcolor" style="text"> - <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> + <if condition="@desc=='Y'"> + <var var="i18n::translate('Yes')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc=='N'"> + <var var="i18n::translate('No')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc!='Y' and @desc!='N'"> + <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> + </if> </Text> <Gedcom id="@_PGVS"> <if condition="@SEX=='M'"> @@ -173,7 +197,6 @@ <!-- facts without descriptions --> <if condition="@desc==''"> <TextBox bgcolor="$fbbgcolor" border="1" newline="1" width="$width2"> - <Text color="$tcolor" style="fact"><var var="i18n::translate('Place')"/> </Text> <Text color="$tcolor" style="text"> <GedcomValue tag="@fact:PLAC"/> <!-- Print only when exist to reduce some spaces in the text, might avoid a line break --> @@ -210,16 +233,32 @@ <TextBox bgcolor="$mbgcolor" border="1" newline="1" width="$width"> <Text color="$tcolor" style="text"><var var="i18n::translate('Father')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -230,16 +269,32 @@ <TextBox bgcolor="$fbgcolor" border="1" newline="1" width="$width"> <Text color="$tcolor" style="text"><var var="i18n::translate('Mother')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -254,16 +309,32 @@ <TextBox bgcolor="$mbgcolor" border="1" left="15" newline="1" width="$width1"> <Text color="$tcolor" style="text"><var var="i18n::translate('Brother')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -274,16 +345,32 @@ <TextBox bgcolor="$fbgcolor" border="1" left="15" newline="1" width="$width1"> <Text color="$tcolor" style="text"><var var="i18n::translate('Sister')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> - <SetVar name="source_exist" value="1"/> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -294,16 +381,32 @@ <TextBox bgcolor="$ugbgcolor" border="1" left="15" newline="1" width="$width1"> <Text color="$tcolor" style="text"><var var="i18n::translate('Gender')"/> <var var="i18n::translate_c('unknown gender', 'Unknown')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -336,16 +439,32 @@ <TextBox bgcolor="$mbgcolor" border="1" newline="1" width="$width"> <Text color="$tcolor" style="text"><var var="i18n::translate('Husband')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -356,16 +475,32 @@ <TextBox bgcolor="$fbgcolor" border="1" newline="1" width="$width"> <Text color="$tcolor" style="text"><var var="i18n::translate('Wife')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -381,16 +516,32 @@ <TextBox bgcolor="$mbgcolor" border="1" left="15" newline="1" width="$width1"> <Text color="$tcolor" style="text"><var var="i18n::translate('Son')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -401,16 +552,32 @@ <TextBox bgcolor="$fbgcolor" border="1" left="15" newline="1" width="$width1"> <Text color="$tcolor" style="text"><var var="i18n::translate('Daughter')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -421,16 +588,32 @@ <TextBox bgcolor="$ugbgcolor" border="1" left="15" newline="1" width="$width1"> <Text color="$tcolor" style="text"><var var="i18n::translate('Gender')"/> <var var="i18n::translate_c('unknown gender', 'Unknown')"/> </Text> <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> - <if condition="($sources==1) and (@SOUR!='')"> + <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL"/> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="PAGE"/> <GedcomValue tag="DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> @@ -443,8 +626,8 @@ </RepeatTag> </Relatives> </Body> - <!-- print the sources --> - <if condition="($sources==1) and ($source_exist==1)"> + <!-- if the sources were on, print the source citations as footnotes --> + <if condition="$source_exist==1"> <!-- add a new page --> <NewPage/> <Body> diff --git a/modules/individual_report/report.xml b/modules/individual_report/report.xml index 54c39bfb05..87ff71a531 100644 --- a/modules/individual_report/report.xml +++ b/modules/individual_report/report.xml @@ -11,39 +11,74 @@ <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input> <!-- Header --> - <Style name="header" font="$fonts" size="18" /> + <Style name="header" font="$fonts" size="18"/> <!-- Generated by style - required style name by the generator --> - <Style name="genby" font="$fonts" size="8" /> - <!-- Page numbers text --> - <Style name="pagenum" font="$fonts" size="8" /> - <!-- Source text - FootnoteTexts - required style name by the generator --> - <Style name="footnote" font="$fonts" size="8" /> + <Style name="genby" font="$fonts" size="8"/> <!-- Links to sources - required style name by the generator --> - <Style name="footnotenum" font="$fonts" size="6" /> + <Style name="footnotenum" font="$fonts" size="6"/> + <!-- Source text - FootnoteTexts - required style name by the generator --> + <Style name="footnote" font="$fonts" size="8"/> + <!-- Section title --> + <Style name="title" font="$fonts" size="9" style="B"/> + <!-- Page numbers text --> + <Style name="pagenum" font="$fonts" size="8"/> + <!-- Page Header text --> + <Style name="pageheader" font="$fonts" size="14"/> + <!-- Standard text --> + <Style name="text" font="$fonts" size="9"/> + <!-- Facts text --> + <Style name="fact" font="$fonts" size="8"/> + <!-- Individual names in text boxes --> + <Style name="name" font="$fonts" size="10"/> <!-- Date text --> <Style name="date" font="$fonts" size="8"/> - <Style name="label1" font="$fonts" size="9" /> - <Style name="name" font="$fonts" size="10" /> - <Style name="name1" font="$fonts" size="14" /> - <Style name="text" font="$fonts" size="9" /> - <SetVar name="ignore" value="CHAN,NAME,SEX,SOUR,NOTE,OBJE,RESN,FAMC,FAMS,TITL,CHIL,HUSB,WIFE,_UID,_WT_OBJE_SORT" /> + <SetVar name="ignore" value="CHAN,CHIL,FAMC,FAMS,HUSB,NAME,NOTE,OBJE,RESN,SEX,SOUR,TITL,WIFE,_UID,_WT_OBJE_SORT"/> + <!-- Setup colors --> <!-- Section title background color --> <SetVar name="stbgcolor" value="#AAAAAA"/> + <SetVar name="mbgcolor" value=""/> + <SetVar name="fbgcolor" value=""/> + <SetVar name="ugbgcolor" value=""/> + <SetVar name="fbbgcolor" value=""/> + <SetVar name="tcolor" value=""/> + <!-- Use colors --> + <if condition="$colors==1"> + <!-- Section title background color --> + <SetVar name="stbgcolor" value="#9CA3D4"/> + <!-- Male background color --> + <SetVar name="mbgcolor" value="#D6E0EA"/> + <!-- Female background color --> + <SetVar name="fbgcolor" value="#E9DAF1"/> + <!-- Unknown gender --> + <SetVar name="ugbgcolor" value="#FFFFFF"/> + <!-- Fact boxes --> + <SetVar name="fbbgcolor" value="#D1D9FF"/> + <!-- Text color - black --> + <SetVar name="tcolor" value="#000000"/> + </if> + + <!-- New Page controller --> + <SetVar name="newpage" value="0"/> + <!-- New Page for Sources controller if SOUR exist --> + <SetVar name="source_exist" value="0"/> + <!-- set the default widths --> - <SetVar name="width" value="433" /> - <SetVar name="width1" value="418" /> - <SetVar name="width2" value="233" /> - <SetVar name="dwidth" value="200" /> - <SetVar name="pwidth" value="436" /> + <SetVar name="dwidth" value="200"/> + <SetVar name="pwidth" value="436"/> + <!-- space height --> + <SetVar name="sheight" value="15"/> + + <SetVar name="width" value="433"/> + <SetVar name="width1" value="418"/> + <SetVar name="width2" value="233"/> + <!-- change the widths for no pictures --> <if condition="$photos=='none'"> <SetVar name="width" value="0"/> <SetVar name="width1" value="0"/> <SetVar name="width2" value="0"/> </if> - <!-- New Page for Sources controller if SOUR exist --> - <SetVar name="source_exist" value="0" /> <Doc pageSize="$pageSize" > <Header> @@ -53,7 +88,44 @@ <Body> <!-- set the gedcom context for this individual --> <Gedcom id="$pid"> - <Cell newline="1" style="name1"><GetPersonName id=""/></Cell> + <if condition="$newpage==1"> + <NewPage/> + </if> + <SetVar name="newpage" value="1"/> + <SetVar name="sex" value="@SEX"/> + <SetVar name="mid" value="@ID"/> + <!-- Individual name --> + <TextBox newline="1"> + <Text style="pageheader"><GetPersonName id=""/> </Text> + <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> + </if> + </TextBox> <!-- show the persons images --> <if condition="$photos=='all'"> <!-- This is an image not a text, so don't use text padding @@ -70,279 +142,496 @@ <if condition="$photos=='highlighted'"> <HighlightedImage left="$pwidth" width="80"/> </if> - - <!-- print the person's facts --> - <TextBox bgcolor="$stbgcolor" border="1" height="16" newline="1" width="$width"> - <Text style="label1"><var var="i18n::translate('Personal Facts and Details')" /></Text> - </TextBox> - - <!-- print level 1 sources --> - <TextBox border="1" width="$width" height="16" newline="1"> - <Text style="name"><GetPersonName id=""/> </Text> - <if condition="$sources==1"> - <RepeatTag tag="SOUR"> - <Footnote> - <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> - </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> - </Footnote> - <SetVar name="source_exist" value="1"/> - </RepeatTag> - </if> - </TextBox> + <!-- Print the individuals facts --> + <Cell tcolor="$tcolor" bgcolor="$stbgcolor" border="1" newline="1" style="title" width="$width"><var var="i18n::translate('Personal Facts and Details')"/></Cell> <Facts ignore="$ignore" families="1"> - <TextBox border="1" width="$dwidth" height="16"> - <Text style="pagenum"><var var="@fact" /> </Text> - <Text style="text"><GedcomValue tag="@fact:DATE" /> </Text> + <TextBox bgcolor="$fbbgcolor" border="1" width="$dwidth"> + <Text color="$tcolor" style="fact"><var var="@fact"/> </Text> + <Text color="$tcolor" style="text"><GedcomValue tag="@fact:DATE"/> </Text> <!-- look for fact level 2 sources --> <if condition="$sources==1"> <RepeatTag tag="@fact:SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> - <SetVar name="source_exist" value="1"/> + <SetVar name="source_exist" value="1" /> </RepeatTag> </if> </TextBox> <!-- print a different layout for facts with descriptions --> <if condition="@desc!=''"> - <TextBox border="1" width="$width2" height="16" newline="1"> - <Text style="text"><GedcomValue tag="@desc" /> - <!-- Print this only when it's needed --> - <if condition="@PLAC!=''"> </if> - <GedcomValue tag="@fact:PLAC" /> + <TextBox bgcolor="$fbbgcolor" border="1" newline="1" width="$width2"> + <Text color="$tcolor" style="text"> + <if condition="@desc=='Y'"> + <var var="i18n::translate('Yes')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc=='N'"> + <var var="i18n::translate('No')" /> <GedcomValue tag="@fact:PLAC"/> + </if> + <if condition="@desc!='Y' and @desc!='N'"> + <GedcomValue tag="@desc"/> <GedcomValue tag="@fact:PLAC"/> + </if> </Text> <Gedcom id="@_PGVS"> <if condition="@SEX=='M'"> - <Text style="pagenum"> <var var="i18n::translate('Husband')" /></Text> + <Text color="$tcolor" style="fact"> <var var="i18n::translate('Husband')"/></Text> </if> <if condition="@SEX=='F'"> - <Text style="pagenum"> <var var="i18n::translate('Wife')" /></Text> + <Text color="$tcolor" style="fact"> <var var="i18n::translate('Wife')"/></Text> </if> - <Text style="text"> <GetPersonName id="" /></Text> + <Text color="$tcolor" style="text"> <GetPersonName id=""/></Text> </Gedcom> </TextBox> </if> <!-- facts without descriptions --> <if condition="@desc==''"> - <TextBox border="1" width="$width2" height="16" newline="1"> - <if condition="@PLAC!=''"> - <Text style="pagenum"><var var="i18n::translate('Place')" /> </Text> - </if> - <Text style="text"> - <GedcomValue tag="@fact:PLAC" /> <GedcomValue tag="@fact:TEMP" /> + <TextBox bgcolor="$fbbgcolor" border="1" newline="1" width="$width2"> + <Text color="$tcolor" style="text"> + <GedcomValue tag="@fact:PLAC"/> + <!-- Print only when exist to reduce some spaces in the text, might avoid a line break --> + <if condition="@fact:TEMP!=''"> <GedcomValue tag="@fact:TEMP"/></if> </Text> <Gedcom id="@_PGVS"> <if condition="@SEX=='M'"> - <Text style="pagenum"> <var var="i18n::translate('Husband')" /></Text> + <Text color="$tcolor" style="fact"> <var var="i18n::translate('Husband')"/></Text> </if> <if condition="@SEX=='F'"> - <Text style="pagenum"> <var var="i18n::translate('Wife')" /></Text> + <Text color="$tcolor" style="fact"> <var var="i18n::translate('Wife')"/></Text> </if> - <Text style="text"> <GetPersonName id="" /></Text> + <Text color="$tcolor" style="text"> <GetPersonName id=""/></Text> </Gedcom> </TextBox> </if> </Facts> - - <!-- print any level 1 notes --> + <!-- print any level 1 notes, but only if exist --> <if condition="($notes==1) and (@NOTE!='')"> - <TextBox width="15" height="16" newline="1" padding="0"/> - <TextBox border="1" width="$width" height="16" newline="1" bgcolor="$stbgcolor"> - <Text style="label1"><var var="i18n::translate('Notes')" /></Text> - </TextBox> + <TextBox height="$sheight" newline="1" padding="0" width="15"/> + <Cell bgcolor="$stbgcolor" border="1" newline="1" style="title" tcolor="$tcolor" width="$width"><var var="i18n::translate('Notes')"/></Cell> <RepeatTag tag="NOTE"> - <TextBox border="1" width="$width" height="16" newline="1"> - <Text style="pagenum"><GedcomValue tag="NOTE" /><br/></Text> - </TextBox> + <Cell bgcolor="$fbbgcolor" border="1" newline="1" style="text" tcolor="$tcolor" width="$width"><GedcomValue tag="NOTE"/></Cell> </RepeatTag> </if> <!-- print family with parents and siblings --> - <TextBox width="15" height="16" newline="1" padding="0"/> - <TextBox border="1" width="$width" height="16" newline="1" bgcolor="$stbgcolor"> - <Text style="label1"><var var="i18n::translate('Family with parents')" /></Text> - </TextBox> + <TextBox height="$sheight" newline="1" padding="0" width="15"/> + <Cell bgcolor="$stbgcolor" border="1" newline="1" style="title" tcolor="$tcolor" width="$width"><var var="i18n::translate('Family with parents')"/></Cell> <RepeatTag tag="FAMC"> <Gedcom id="@FAMC"> <!-- father --> <Gedcom id="@HUSB"> - <TextBox border="1" width="$width" height="16" newline="1"> - <Text style="label1"><var var="i18n::translate('Father')" /> </Text> - <Text style="name"> <GetPersonName id="" /> </Text> + <TextBox bgcolor="$mbgcolor" border="1" newline="1" width="$width"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Father')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> - <Text style="text"> (<var var="i18n::translate('Birth')" />: <GedcomValue tag="BIRT:DATE" /> <GedcomValue tag="BIRT:PLAC" /> - <var var="i18n::translate('Death')" />: <GedcomValue tag="DEAT:DATE" /> <GedcomValue tag="DEAT:PLAC" />)</Text> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> </TextBox> </Gedcom> <!-- mother --> <Gedcom id="@WIFE"> - <TextBox border="1" width="$width" height="16" newline="1"> - <Text style="label1"><var var="i18n::translate('Mother')" /> </Text> - <Text style="name"> <GetPersonName id="" /> </Text> + <TextBox bgcolor="$fbgcolor" border="1" newline="1" width="$width"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Mother')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> - <Text style="text"> (<var var="i18n::translate('Birth')" />: <GedcomValue tag="BIRT:DATE" /> <GedcomValue tag="BIRT:PLAC" /> - <var var="i18n::translate('Death')" />: <GedcomValue tag="DEAT:DATE" /> <GedcomValue tag="DEAT:PLAC" />)</Text> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> </TextBox> </Gedcom> <!-- siblings --> <RepeatTag tag="CHIL"> - <if condition="@CHIL!=$pid"> - <Gedcom id="@CHIL"> - <TextBox border="1" left="15" width="$width1" height="16" newline="1"> - <!-- Brother --> - <if condition="@SEX=='M'"> - <Text style="label1"><var var="i18n::translate('Brother')" /> </Text> - </if> - <!-- Sister --> - <if condition="@SEX=='F'"> - <Text style="label1"><var var="i18n::translate('Sister')" /> </Text> - </if> - <!-- Unknown gender --> - <if condition="(@SEX=='U') or (@SEX=='')"> - <Text style="label1"><var var="i18n::translate('Gender')" /> <var var="i18n::translate_c('unknown gender', 'Unknown')"/> </Text> - </if> - <Text style="name"> <GetPersonName id="" /> </Text> - <if condition="$sources==1"> - <RepeatTag tag="SOUR"> - <Footnote> - <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> - </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> - </Footnote> - <SetVar name="source_exist" value="1"/> - </RepeatTag> - </if> - <Text style="text"> (<var var="i18n::translate('Birth')" />: <GedcomValue tag="BIRT:DATE" /> <GedcomValue tag="BIRT:PLAC" /> - <var var="i18n::translate('Death')" />: <GedcomValue tag="DEAT:DATE" /> <GedcomValue tag="DEAT:PLAC" />)</Text> - </TextBox> + <if condition="@CHIL!=$mid"> + <Gedcom id="@CHIL"> + <!-- Brother --> + <if condition="@SEX=='M'"> + <TextBox bgcolor="$mbgcolor" border="1" left="15" newline="1" width="$width1"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Brother')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> + <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> + </if> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> + </TextBox> + </if> + <!-- Sister --> + <if condition="@SEX=='F'"> + <TextBox bgcolor="$fbgcolor" border="1" left="15" newline="1" width="$width1"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Sister')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> + <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> + </if> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> + </TextBox> + </if> + <!-- Unknown gender for Sibling --> + <if condition="(@SEX=='U') or (@SEX=='')"> + <TextBox bgcolor="$ugbgcolor" border="1" left="15" newline="1" width="$width1"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Gender')"/> <var var="i18n::translate_c('unknown gender', 'Unknown')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> + <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> + </if> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> + </TextBox> + </if> </Gedcom> </if> </RepeatTag> </Gedcom> </RepeatTag> - <!-- print family with spouse and children --> <RepeatTag tag="FAMS"> <Gedcom id="@FAMS"> <!-- print wife if person is husband --> - <if condition="$pid==@HUSB"> - <TextBox width="15" height="16" newline="1" padding="0"/> - <TextBox border="1" width="$width" height="16" newline="1" bgcolor="$stbgcolor"> - <Text style="label1"><var var="i18n::translate('Family with wife')" /></Text> - </TextBox> - <SetVar name="spid" value="@WIFE" /> + <if condition="$sex=='M'"> + <TextBox height="$sheight" newline="1" padding="0" width="15"/> + <Cell bgcolor="$stbgcolor" border="1" newline="1" style="title" tcolor="$tcolor" width="$width"><var var="i18n::translate('Family with wife')"/></Cell> + <SetVar name="spid" value="@WIFE"/> </if> <!-- print husband if person is wife --> - <if condition="$pid==@WIFE"> - <TextBox width="15" height="16" newline="1" padding="0"/> - <TextBox border="1" width="$width" height="16" newline="1" bgcolor="$stbgcolor"> - <Text style="label1"><var var="i18n::translate('Family with husband')" /></Text> - </TextBox> - <SetVar name="spid" value="@HUSB" /> + <if condition="$sex=='F'"> + <TextBox height="$sheight" newline="1" padding="0" width="15"/> + <Cell bgcolor="$stbgcolor" border="1" newline="1" style="title" tcolor="$tcolor" width="$width"><var var="i18n::translate('Family with husband')"/></Cell> + <SetVar name="spid" value="@HUSB"/> </if> - <!-- print information for spouse --> <Gedcom id="$spid"> - <TextBox border="1" width="$width" height="16" newline="1"> - <if condition="@SEX=='M'"> - <Text style="label1"><var var="i18n::translate('Husband')" /> </Text> - </if> - <if condition="@SEX=='F'"> - <Text style="label1"><var var="i18n::translate('Wife')" /> </Text> - </if> - <Text style="name"> <GetPersonName id="" /> </Text> - <if condition="$sources==1"> - <RepeatTag tag="SOUR"> - <Footnote> - <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> - </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> - </Footnote> - <SetVar name="source_exist" value="1"/> - </RepeatTag> - </if> - <Text style="text"> (<var var="i18n::translate('Birth')" />: <GedcomValue tag="BIRT:DATE" /> <GedcomValue tag="BIRT:PLAC" /> - <var var="i18n::translate('Death')" />: <GedcomValue tag="DEAT:DATE" /> <GedcomValue tag="DEAT:PLAC" />)</Text> - </TextBox> - </Gedcom> - <!-- print children --> - <RepeatTag tag="CHIL"> - <if condition="@CHIL!=$pid"> - <Gedcom id="@CHIL"> - <TextBox border="1" left="15" width="$width1" height="16" newline="1"> - <!-- Son --> - <if condition="@SEX=='M'"> - <Text style="label1"><var var="i18n::translate('Son')" /> </Text> - </if> - <!-- Daughter --> - <if condition="@SEX=='F'"> - <Text style="label1"><var var="i18n::translate('Daughter')" /> </Text> - </if> - <!-- Unknown gender --> - <if condition="(@SEX=='U') or (@SEX=='')"> - <Text style="label1"><var var="i18n::translate('Gender')"/> <var var="i18n::translate_c('unknown gender', 'Unknown')"/> </Text> + <!-- husband --> + <if condition="@SEX=='M'"> + <TextBox bgcolor="$mbgcolor" border="1" newline="1" width="$width"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Husband')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> + <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> - <Text style="name"> <GetPersonName id="" /> </Text> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> + </TextBox> + </if> + <!-- wife --> + <if condition="@SEX=='F'"> + <TextBox bgcolor="$fbgcolor" border="1" newline="1" width="$width"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Wife')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> <if condition="$sources==1"> + <!-- print level 1 sources --> <RepeatTag tag="SOUR"> <Footnote> <Gedcom id="@SOUR"> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> - <if condition="@PAGE!=''">: </if> - <GedcomValue tag="SOUR:PAGE"/> <GedcomValue tag="SOUR:DATA:TEXT"/> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> </Footnote> <SetVar name="source_exist" value="1"/> </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> </if> - <Text style="text"> (<var var="i18n::translate('Birth')" />: <GedcomValue tag="BIRT:DATE" /> <GedcomValue tag="BIRT:PLAC" /> - <var var="i18n::translate('Death')" />: <GedcomValue tag="DEAT:DATE" /> <GedcomValue tag="DEAT:PLAC" />)</Text> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> </TextBox> + </if> + </Gedcom> + <!-- print children with spouse --> + <RepeatTag tag="CHIL"> + <if condition="@CHIL!=$mid"> + <Gedcom id="@CHIL"> + <!-- Son --> + <if condition="@SEX=='M'"> + <TextBox bgcolor="$mbgcolor" border="1" left="15" newline="1" width="$width1"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Son')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> + <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> + </if> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> + </TextBox> + </if> + <!-- Daughter --> + <if condition="@SEX=='F'"> + <TextBox bgcolor="$fbgcolor" border="1" left="15" newline="1" width="$width1"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Daughter')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> + <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> + </if> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> + </TextBox> + </if> + <!-- Unknown gender for Child --> + <if condition="(@SEX=='U') or (@SEX=='')"> + <TextBox bgcolor="$ugbgcolor" border="1" left="15" newline="1" width="$width1"> + <Text color="$tcolor" style="text"><var var="i18n::translate('Gender')"/> <var var="i18n::translate_c('unknown gender', 'Unknown')"/> </Text> + <Text color="$tcolor" style="name"><GetPersonName id=""/> </Text> + <if condition="$sources==1"> + <!-- print level 1 sources --> + <RepeatTag tag="SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1"/> + </RepeatTag> + <!-- print level 2 sources attached to NAME --> + <RepeatTag tag="NAME:SOUR"> + <Footnote> + <Gedcom id="@SOUR"> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> + </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> + </Footnote> + <SetVar name="source_exist" value="1" /> + </RepeatTag> + </if> + <Text color="$tcolor" style="text"> (<var var="i18n::translate('Birth')"/>: <GedcomValue tag="BIRT:DATE"/> <GedcomValue tag="BIRT:PLAC"/><Gedcom id="DEAT"> - <var var="i18n::translate('Death')"/>: <GedcomValue tag="DEAT:DATE"/> <GedcomValue tag="DEAT:PLAC"/></Gedcom>)</Text> + </TextBox> + </if> </Gedcom> </if> </RepeatTag> </Gedcom> </RepeatTag> </Gedcom> - - <!-- print the sources --> - <if condition="($sources==1) and ($source_exist==1)"> - <TextBox width="$width" newline="1"> - <Text style="name1"><var var="i18n::translate('Sources')" /><br /><br /></Text> - <FootnoteTexts /> - </TextBox> - </if> </Body> + <!-- if the sources were on, print the source citations as footnotes --> + <if condition="$source_exist==1"> + <Body> + <TextBox newline="1"> + <Text style="pageheader"><var var="i18n::translate('Sources')"/><br /><br /></Text> + <FootnoteTexts/> + </TextBox> + </Body> + </if> <Footer> - <Cell align="rightrtl" newline="1" style="date"><Now /></Cell> + <Cell align="rightrtl" newline="1" style="date"><Now/></Cell> </Footer> </Doc> </Report> diff --git a/modules/marriage_report/report.xml b/modules/marriage_report/report.xml index e2a1499ac4..fff9086d3a 100644 --- a/modules/marriage_report/report.xml +++ b/modules/marriage_report/report.xml @@ -44,7 +44,7 @@ <Text style="label"><var var="i18n::translate('Date')" /></Text> </TextBox> - <TextBox border="1" height="12" width="225"> + <TextBox border="1" height="12" width="150"> <Text style="label"><var var="i18n::translate('Place')" /></Text> </TextBox> @@ -78,7 +78,7 @@ <TextBox height="12" width="200"> <Text style="text"><GetPersonName id="@HUSB" /></Text> <Text style="spouse"> - <br /> <GetPersonName id="@WIFE" /> (<GedcomValue tag="@id" />) + <br /> <GetPersonName id="@WIFE" /> </Text> </TextBox> @@ -86,7 +86,7 @@ <Text style="text"><GedcomValue tag="MARR:DATE" newline="1" /></Text> </TextBox> - <TextBox height="12" width="225"> + <TextBox height="12" width="150"> <Text style="text"><GedcomValue tag="MARR:PLAC" /></Text> </TextBox> @@ -97,8 +97,12 @@ <RepeatTag tag="MARR:SOUR"> <Gedcom id="@SOUR"> <if condition="$usebr==1"><br /></if> - <GedcomValue tag="TITL" /> + <if condition="@AUTH!=''"><GedcomValue tag="AUTH" />, </if> + «<GedcomValue tag="TITL" />» + <if condition="@PUBL!=''"> (<GedcomValue tag="PUBL" />)</if> </Gedcom> + <if condition="@PAGE!=''">: <GedcomValue tag="SOUR:PAGE" /></if> + <GedcomValue tag="SOUR:DATA:TEXT" /> <SetVar name="usebr" value="1"/> </RepeatTag> </Text> diff --git a/modules/occupation_report/module.php b/modules/occupation_report/module.php new file mode 100644 index 0000000000..ace6c2e39f --- /dev/null +++ b/modules/occupation_report/module.php @@ -0,0 +1,63 @@ +<?php
+/**
+ * Classes and libraries for module system
+ *
+ * webtrees: Web based Family History software
+ * Copyright (C) 2010 webtrees development team.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * @package webtrees
+ * @subpackage Modules
+ * @version $Id: module.php 9954 2010-11-25 04:35:13Z larry $
+ */
+
+if (!defined('WT_WEBTREES')) {
+ header('HTTP/1.0 403 Forbidden');
+ exit;
+}
+require_once WT_ROOT.'includes/classes/class_module.php';
+
+class occupation_report_WT_Module extends WT_Module implements WT_Module_Report {
+ // Extend class WT_Module
+ public function getTitle() {
+ return i18n::translate('Occupation Report');
+ }
+
+ // Extend class WT_Module
+ public function getDescription() {
+ return i18n::translate('Prints a list of individuals occupation matching specific criteria');
+ }
+
+ // Extend class WT_Module
+ public function defaultAccessLevel() {
+ return WT_PRIV_USER;
+ }
+
+ // Implement WT_Module_Report - a module can provide many reports
+ public function getReportMenus() {
+ global $WT_IMAGES, $TEXT_DIRECTION;
+
+ if ($TEXT_DIRECTION=="rtl") $ff="_rtl"; else $ff="";
+
+ $menus=array();
+ $menu=new Menu($this->getTitle(), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report.xml');
+ $menu->addIcon('indis');
+ $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports");
+ $menus[]=$menu;
+
+ return $menus;
+ }
+}
diff --git a/modules/occupation_report/report.xml b/modules/occupation_report/report.xml new file mode 100644 index 0000000000..00a55426b0 --- /dev/null +++ b/modules/occupation_report/report.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<Report>
+<!-- $Id: report.xml 10021 2010-12-10 15:09:34Z lukasz $ -->
+ <Title><var var="i18n::translate('Occupation Report')" /></Title>
+ <Description>Prints a list of individuals occupation matching specific criteria</Description>
+ <Input name="occupation" lookup="OCCU" type="text"><var var="translate_fact('OCCU')" /> </Input>
+ <Input name="sortby" type="select" default="NAME" options="none=>i18n::translate('None')|NAME=>i18n::translate('Name')|BIRT:DATE=>translate_fact('BIRT:DATE')"><var var="i18n::translate('Sort by')" /></Input>
+ <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input>
+ <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input>
+
+ <!-- Header -->
+ <Style name="header" font="$fonts" size="16" style="b" />
+ <!-- Page numbers text -->
+ <Style name="pagenum" font="$fonts" size="8"/>
+ <!-- Standard text -->
+ <Style name="text" font="$fonts" size="8"/>
+ <!-- Column labels -->
+ <Style name="label" font="$fonts" size="10" style="b" />
+ <!-- Generated by style - required style name by the generator -->
+ <Style name="genby" font="$fonts" size="8" />
+ <!-- Date text -->
+ <Style name="date" font="$fonts" size="8"/>
+
+ <!-- landscape orientation -->
+ <SetVar name="namewidth" value="180"/>
+ <SetVar name="datewidth" value="95"/>
+ <SetVar name="occuwidth" value="130"/>
+ <SetVar name="occudatewidth" value="95"/>
+ <SetVar name="placewidth" value="100"/>
+ <SetVar name="printedoccupation" value="0" />
+ <SetVar name="morespaceindi" value="$namewidth + $datewidth" />
+
+ <Doc pageSize="$pageSize" orientation="landscape">
+ <Header>
+ <Cell align="center" height="20" newline="1" style="header"><var var="i18n::translate('Occupation Report')" /></Cell>
+ <Cell align="rightrtl" newline="1" style="pagenum"><var var="i18n::translate('Page')" /> <PageNum /> <var var="i18n::translate('of')" /> <TotalPages /></Cell>
+
+ <SetVar name="fill" value="" />
+ <if condition="$sortby=='NAME'"><SetVar name="fill" value="#AAAAAA" /></if>
+ <TextBox bgcolor="$fill" border="1" width="$namewidth">
+ <Text style="label"><var var="i18n::translate('Name')" /></Text>
+ </TextBox>
+
+ <SetVar name="fill" value="" />
+ <if condition="$sortby=='BIRT:DATE'"><SetVar name="fill" value="#AAAAAA" /></if>
+ <TextBox bgcolor="$fill" border="1" width="$datewidth">
+ <Text style="label"><var var="translate_fact('BIRT:DATE')" /></Text>
+ </TextBox>
+ <!-- should print and sort by birth date -->
+
+ <TextBox border="1" width="$occuwidth">
+ <Text style="label"><var var="translate_fact('OCCU')" /></Text>
+ </TextBox>
+ <TextBox border="1" width="$occudatewidth">
+ <Text style="label"><var var="translate_fact('DATE')" /></Text>
+ </TextBox>
+ <TextBox border="1" width="$placewidth">
+ <Text style="label"><var var="translate_fact('PLAC')" /></Text>
+ </TextBox>
+
+ <TextBox border="1" newline="1">
+ <Text style="label"><var var="translate_fact('NOTE')" /></Text>
+ </TextBox>
+ </Header>
+ <Body>
+ <List list="individual" filter1="OCCU CONTAINS $occupation" sortby="$sortby">
+ <SetVar name="moreoccupation" value="0" />
+ <!-- Printed List counter -->
+ <SetVar name="printedoccupation" value="$printedoccupation + 1" />
+ <Cell style="text" width="$namewidth"><GetPersonName id="" />
+ </Cell>
+ <Cell style="text" width="$datewidth"><GedcomValue tag="BIRT:DATE" newline="1" /></Cell>
+ <RepeatTag tag="OCCU">
+ <!-- Intend the fact line if more then one occupation -->
+ <if condition="$moreoccupation==1">
+ <Cell style="text" width="$morespaceindi"> </Cell>
+ </if>
+ <Cell style="text" width="$occuwidth"><GedcomValue tag="OCCU"/></Cell>
+ <!-- Date of the fact -->
+ <Cell style="text" width="$occudatewidth"><GedcomValue tag="OCCU:DATE"/></Cell>
+ <!-- Place of the fact -->
+ <Cell style="text" width="$placewidth"><GedcomValue tag="OCCU:PLAC"/></Cell>
+ <!-- Note text -->
+ <Cell style="text" newline="1">
+ <RepeatTag tag="OCCU">
+ <GedcomValue tag="OCCU:NOTE"/>
+ <if condition="OCCU:NOTE!=''">
+ <br /><GedcomValue tag="OCCU:NOTE"/>
+ </if>
+ </RepeatTag>
+ </Cell>
+ <SetVar name="moreoccupation" value="1" />
+ </RepeatTag>
+ </List>
+ <Cell align="rightrtl" newline="1" style="label"><br /><var var="i18n::translate('Total individuals')" />: <ListTotal /></Cell>
+ </Body>
+ <Footer>
+ <Cell align="rightrtl" newline="1" style="date"><Now /></Cell>
+ </Footer>
+ </Doc>
+</Report>
\ No newline at end of file diff --git a/modules/relative_ext_report/report.xml b/modules/relative_ext_report/report.xml index af8ed60f4f..74a0392dc8 100644 --- a/modules/relative_ext_report/report.xml +++ b/modules/relative_ext_report/report.xml @@ -5,7 +5,7 @@ <Description>Prints a list of individuals related to a specific person</Description> <Input name="pid" lookup="INDI" type="text"><var var="i18n::translate('Enter Individual ID')" /></Input> <Input name="relatives" type="select" options="child-family=>i18n::translate('Parents and siblings')|spouse-family=>i18n::translate('Spouses and children')|direct-ancestors=>i18n::translate('Direct line ancestors')|ancestors=>i18n::translate('Direct line ancestors and their families')|descendants=>i18n::translate('Descendants')|all=>i18n::translate('All')"><var var="i18n::translate('Choose relatives')" /></Input> - <Input name="sortby" type="select" default="BIRT:DATE" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input> + <Input name="sortby" type="select" default="BIRT:DATE" options="none=>i18n::translate('None')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input> <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input> <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input> @@ -26,7 +26,7 @@ <SetVar name="height1" value="14" /> <SetVar name="height2" value="10" /> <SetVar name="width1" value="45" /> - <SetVar name="width2" value="150" /> + <SetVar name="width2" value="195" /> <SetVar name="width3" value="120" /> <SetVar name="width4" value="120" /> <SetVar name="width5" value="150" /> @@ -42,12 +42,6 @@ <Cell align="rightrtl" newline="1" style="pagenum"><var var="i18n::translate('Page')" /> <PageNum /> <var var="i18n::translate('of')" /> <TotalPages /></Cell> <SetVar name="fill" value="" /> - <if condition="$sortby=='ID'"> - <SetVar name="fill" value="#AAAAAA" /> - </if> - <Cell bgcolor="$fill" border="1" height="$height1" style="label" width="$width1"> </Cell> - - <SetVar name="fill" value="" /> <if condition="$sortby=='NAME'"> <SetVar name="fill" value="#AAAAAA" /> </if> @@ -73,9 +67,6 @@ <Relatives id="$pid" group="$relatives" sortby="$sortby"> <SetVar name="sex" value="@SEX" /> <!-- 1. Block --> - <TextBox height="$height1" width="$width1"> - <Text style="bold"><GedcomValue tag="@id" /></Text> - </TextBox> <TextBox height="$height1" width="$width2"> <Text style="bold"><GetPersonName id="" /></Text> </TextBox> @@ -91,12 +82,12 @@ <Gedcom id="@FAMC"> <TextBox height="$height1" width="$width5"> <Gedcom id="@HUSB"> - <Text style="text"><GetPersonName id="" /> (<GedcomValue tag="@id" />)</Text> + <Text style="text"><GetPersonName id="" /></Text> </Gedcom> </TextBox> <TextBox height="$height1" newline="1"> <Gedcom id="@WIFE"> - <Text style="text"><GetPersonName id="" /> (<GedcomValue tag="@id" />)</Text> + <Text style="text"><GetPersonName id="" /></Text> </Gedcom> </TextBox> </Gedcom> @@ -116,13 +107,13 @@ <Gedcom id="@FAMS"> <TextBox height="$height2" left="$width1" width="$widthB2"> <if condition="$sex=='M'"> - <Text style="mini"> - <var var="i18n::translate('Family')" /> (<GedcomValue tag="@id" />) <var var="i18n::translate('with')" /> <GetPersonName id="@WIFE" /> (<Gedcom id="@WIFE"><GedcomValue tag="@id" /></Gedcom>) <GedcomValue tag="MARR:DATE" /> + <Text style="minibold"><var var="translate_fact('WIFE')" />: </Text> + <Text style="mini"><GetPersonName id="@WIFE" /> <GedcomValue tag="MARR:DATE" /> </Text> </if> <if condition="$sex=='F'"> - <Text style="mini"> - <var var="i18n::translate('Family')" /> (<GedcomValue tag="@id" />) <var var="i18n::translate('with')" /> <GetPersonName id="@HUSB" /> (<Gedcom id="@HUSB"><GedcomValue tag="@id" /></Gedcom>) <GedcomValue tag="MARR:DATE" /> + <Text style="minibold"><var var="translate_fact('HUSB')" />: </Text> + <Text style="mini"><GetPersonName id="@HUSB" /> <GedcomValue tag="MARR:DATE" /> </Text> </if> </TextBox> @@ -136,7 +127,7 @@ <Text style="mini"> <!-- Print this only when more than one child exist --> <if condition="$morechildren==1">, </if> - <GetPersonName id="" /> (<GedcomValue tag="@id" />) + <GetPersonName id="" /> </Text> <SetVar name="morechildren" value="1" /> </Gedcom> diff --git a/modules/relative_report/report.xml b/modules/relative_report/report.xml index 84506efc7e..f3b12f077c 100644 --- a/modules/relative_report/report.xml +++ b/modules/relative_report/report.xml @@ -5,7 +5,7 @@ <Description>Prints a list of individuals related to a specific person</Description> <Input name="pid" lookup="INDI" type="text"><var var="i18n::translate('Enter Individual ID')" /></Input> <Input name="relatives" type="select" options="child-family=>i18n::translate('Parents and siblings')|spouse-family=>i18n::translate('Spouses and children')|direct-ancestors=>i18n::translate('Direct line ancestors')|ancestors=>i18n::translate('Direct line ancestors and their families')|descendants=>i18n::translate('Descendants')|all=>i18n::translate('All')"><var var="i18n::translate('Choose relatives')" /></Input> - <Input name="sortby" type="select" default="BIRT:DATE" options="none=>i18n::translate('None')|ID=>i18n::translate('ID number')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input> + <Input name="sortby" type="select" default="BIRT:DATE" options="none=>i18n::translate('None')|NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input> <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input> <Input name="pageorient" type="select" default="landscape" options="landscape=>i18n::translate('Landscape')|portrait=>i18n::translate('Portrait')"><var var="i18n::translate('Orientation')" /></Input> <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input> @@ -20,15 +20,13 @@ <if condition="$pageorient=='landscape'"> <!-- landscape orientation --> - <SetVar name="idwidth" value="50"/> - <SetVar name="namewidth" value="180"/> + <SetVar name="namewidth" value="230"/> <SetVar name="birthwidth" value="250"/> </if> <if condition="$pageorient=='portrait'"> <!-- portrait orientation --> - <SetVar name="idwidth" value="45"/> - <SetVar name="namewidth" value="155"/> + <SetVar name="namewidth" value="200"/> <SetVar name="birthwidth" value="160"/> </if> @@ -39,12 +37,6 @@ <Cell align="rightrtl" newline="1" style="pagenum"><var var="i18n::translate('Page')" /> <PageNum /> <var var="i18n::translate('of')" /> <TotalPages /></Cell> <SetVar name="fill" value="" /> - <if condition="$sortby=='ID'"> - <SetVar name="fill" value="#AAAAAA" /> - </if> - <Cell bgcolor="$fill" border="1" style="label" width="$idwidth"> </Cell> - - <SetVar name="fill" value="" /> <if condition="$sortby=='NAME'"> <SetVar name="fill" value="#AAAAAA" /> </if> @@ -67,9 +59,6 @@ <Relatives id="$pid" group="$relatives" sortby="$sortby"> <TextBox height="1" newline="1"/> - <TextBox height="12" width="$idwidth"> - <Text style="text"><GedcomValue tag="@id" /></Text> - </TextBox> <TextBox height="12" width="$namewidth"> <Text style="text"><GetPersonName id="" /></Text> </TextBox> diff --git a/modules/source_report/module.php b/modules/source_report/module.php index 3e2a61f7fa..d8d3384e6c 100644 --- a/modules/source_report/module.php +++ b/modules/source_report/module.php @@ -60,6 +60,11 @@ class source_report_WT_Module extends WT_Module implements WT_Module_Report { $menu->addIcon('menu_source'); $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); $menus[]=$menu; + + $menu=new Menu(i18n::translate('Sources Report'), 'reportengine.php?ged='.WT_GEDURL.'&action=setup&report=modules/'.$this->getName().'/report_s.xml'); + $menu->addIcon('menu_source'); + $menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff", "icon_small_reports"); + $menus[]=$menu; return $menus; } diff --git a/modules/source_report/report_s.xml b/modules/source_report/report_s.xml new file mode 100644 index 0000000000..9ac827c131 --- /dev/null +++ b/modules/source_report/report_s.xml @@ -0,0 +1,278 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<Report>
+ <Title><var var="i18n::translate('Sources Report')" /></Title>
+ <Description>Prints a list of individuals and families with a specific source</Description>
+
+ <Input name="sid" lookup="SOUR" default="" type="text"><var var="i18n::translate('Find Source ID')" /></Input>
+ <Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>i18n::translate('Name')|BIRT:DATE=>i18n::translate('Date of birth')|DEAT:DATE=>i18n::translate('Date of death')"><var var="i18n::translate('Sort by')" /></Input>
+ <Input name="pageSize" type="select" default="A4" options="letter=>i18n::translate_c('paper size','Letter')|A3=>i18n::translate_c('paper size', 'A3')|A4=>i18n::translate_c('paper size','A4')|legal=>i18n::translate_c('paper size','Legal')"><var var="i18n::translate('Page size')" /></Input>
+ <Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>i18n::translate_c('font name', 'Arial')|dejavusans=>i18n::translate_c('font name', 'DejaVu')|helvetica=>i18n::translate_c('font name', 'Helvetica')"><var var="i18n::translate('Font')"/></Input>
+
+ <!-- Header -->
+ <Style name="header" font="$fonts" size="18" style="b" />
+ <!-- Source Title -->
+ <Style name="header2" font="$fonts" size="14" style="b" />
+ <!-- Name of the List Type. INDI or FAM -->
+ <Style name="listtype" font="$fonts" size="12" style="b" />
+ <!-- Page numbers text -->
+ <Style name="pagenum" font="$fonts" size="8" />
+ <!-- Generated by style - required style name by the generator -->
+ <Style name="genby" font="$fonts" size="8" />
+ <!-- Date Text - CSS Style name -->
+ <Style name="date" font="$fonts" size="8"/>
+ <!-- Column list labels - CSS Style name -->
+ <Style name="list_label" font="$fonts" size="9" style="b"/>
+ <!-- List values - CSS Style name -->
+ <Style name="list_value" font="$fonts" size="8"/>
+
+ <SetVar name="nameindi" value="194" />
+ <SetVar name="namefam" value="300" />
+ <SetVar name="dateevent" value="110" />
+ <SetVar name="fact" value="110" />
+ <SetVar name="age" value="38" />
+ <SetVar name="placeevent" value="107" />
+ <SetVar name="vspace" value="5" />
+ <SetVar name="printedsource" value="0" />
+ <SetVar name="ignore" value="CHAN,CHIL,FAMC,FAMS,HUSB,NAME,NOTE,OBJE,RESN,SEX,SOUR,TITL,WIFE,_UID,_WT_OBJE_SORT"/>
+
+ <Doc pageSize="$pageSize" orientation="landscape">
+ <Header>
+ <Cell align="center" newline="1" style="header"><var var="i18n::translate('Sources')" /></Cell>
+ <Cell align="rightrtl" newline="1" style="pagenum"><var var="i18n::translate('Page')" /> <PageNum /> <var var="i18n::translate('of')" /> <TotalPages /></Cell>
+ <!-- Source Title -->
+ <Gedcom id="$sid">
+ <Cell align="center" newline="1" style="header2"><GedcomValue tag="TITL" /></Cell>
+ </Gedcom>
+ </Header>
+
+ <Line />
+ <Body>
+ <!-- List type -->
+ <Cell align="center" newline="1" style="listtype"><var var="i18n::translate('Individuals')" /></Cell>
+ <TextBox height="$vspace" newline="1" padding="0"/>
+
+ <!-- Individual Name -->
+ <SetVar name="fill" value="" />
+ <if condition="$sortby=='NAME'">
+ <SetVar name="fill" value="#AAAAAA" />
+ </if>
+ <Cell bgcolor="$fill" border="1" style="list_label" width="$nameindi"><var var="i18n::translate('Name')" /></Cell>
+ <!-- Birth date -->
+ <SetVar name="fill" value="" />
+ <if condition="$sortby=='BIRT:DATE'">
+ <SetVar name="fill" value="#AAAAAA" />
+ </if>
+ <Cell bgcolor="$fill" border="1" style="list_label" width="$dateevent"><var var="translate_fact('BIRT:DATE')" /></Cell>
+ <!-- Birth place -->
+ <Cell border="1" style="list_label" width="$placeevent"><var var="translate_fact('BIRT:PLAC')" /></Cell>
+ <!-- Death date -->
+ <SetVar name="fill" value="" />
+ <if condition="$sortby=='DEAT:DATE'">
+ <SetVar name="fill" value="#AAAAAA" />
+ </if>
+ <Cell bgcolor="$fill" border="1" style="list_label" width="$dateevent"><var var="translate_fact('DEAT:DATE')" /></Cell>
+ <Cell border="1" style="list_label" width="$age"><var var="translate_fact('AGE')" /></Cell>
+ <!-- Death place -->
+ <Cell border="1" style="list_label" width="$placeevent"><var var="translate_fact('DEAT:PLAC')" /></Cell>
+ <!-- Detailed source text -->
+ <Cell border="1" newline="1" style="list_label"><var var="translate_fact('SOUR:PAGE')" /></Cell>
+ <TextBox height="$vspace" newline="1" padding="0"/>
+
+ <!-- Individual List -->
+ <List list="individual" filter1=":SOUR CONTAINS @$sid@" sortby="$sortby">
+ <SetVar name="moresource" value="0" />
+ <SetVar name="printsource" value="0" />
+ <!-- Printed List counter -->
+ <SetVar name="printedsource" value="$printedsource + 1" />
+ <!-- Individual Name -->
+ <Cell style="list_value" width="$nameindi"><GetPersonName id="" />
+ <Gedcom id="@FAMC">
+ <br /> <var var="i18n::translate('Father')" />: <GetPersonName id="@HUSB"/>
+ <br /> <var var="i18n::translate('Mother')" />: <GetPersonName id="@WIFE"/>
+ </Gedcom>
+ </Cell>
+ <!-- Birth -->
+ <Cell style="list_value" width="$dateevent"><GedcomValue tag="BIRT:DATE" /></Cell>
+ <Cell style="list_value" width="$placeevent"><GedcomValue tag="BIRT:PLAC" /></Cell>
+ <!-- Death -->
+ <Cell style="list_value" width="$dateevent"><GedcomValue tag="DEAT:DATE"/></Cell>
+ <Cell style="list_value" width="$age"><AgeAtDeath /></Cell>
+ <Cell style="list_value" width="$placeevent"><GedcomValue tag="DEAT:PLAC" /></Cell>
+ <Cell style="list_value" newline="1">
+ <Facts ignore="$ignore">
+ <SetVar name="printfact" value="0" />
+ <RepeatTag tag="@fact:SOUR">
+ <Gedcom id="@SOUR">
+ <if condition="@ID==$sid">
+ <SetVar name="printfact" value="1" />
+ </if>
+ </Gedcom>
+ </RepeatTag>
+ <if condition="$printfact==1">
+ <SetVar name="printsource" value="0" />
+ <!-- Intend the fact line if more then one fact has source -->
+ <if condition="$moresource==1">
+ <br />
+ </if>
+ <!-- Detailed source text -->
+ <RepeatTag tag="@fact:SOUR">
+ <Gedcom id="@SOUR">
+ <if condition="@ID==$sid">
+ <SetVar name="printsource" value="1" />
+ </if>
+ </Gedcom>
+ <if condition="$printsource==1">
+ <if condition="@fact=='CHR'">
+ <varLetter var="BIRT" /> <GedcomValue tag="SOUR:PAGE"/>
+ <if condition="@SOUR:DATA:TEXT!=''">
+ <br /><GedcomValue tag="SOUR:DATA:TEXT"/>
+ </if>
+ </if>
+ <if condition="@fact=='BURI'">
+ <varLetter var="DEAT" /> <GedcomValue tag="SOUR:PAGE"/>
+ <if condition="@SOUR:DATA:TEXT!=''">
+ <br /><GedcomValue tag="SOUR:DATA:TEXT"/>
+ </if>
+ </if>
+ <SetVar name="printsource" value="0" />
+ </if>
+ </RepeatTag>
+ <SetVar name="moresource" value="1" />
+ </if>
+ <SetVar name="printfact" value="0" />
+ </Facts>
+ </Cell>
+ <Line />
+ </List>
+
+ <!-- Print the list counter -->
+ <if condition="$printedsource==0">
+ <Cell align="rightrtl" newline="1" style="list_label"><var var="i18n::translate('Total individuals')"/>: 0</Cell>
+ </if>
+ <if condition="$printedsource > 0">
+ <TextBox height="$vspace" newline="1" padding="0"/>
+ <Cell align="rightrtl" newline="1" style="list_label"><var var="i18n::translate('Total individuals')"/>: <var var="printedsource" /></Cell>
+ </if>
+ <NewPage />
+ <!-- Family List -->
+ <TextBox height="$vspace" newline="1" padding="0"/>
+ <Cell align="center" newline="1" style="listtype"><var var="i18n::translate('Families')" /></Cell>
+ <TextBox height="$vspace" newline="1" padding="0"/>
+ <!-- Family Name -->
+ <Cell border="1" style="list_label" width="$namefam"><var var="i18n::translate('Name')" /></Cell>
+ <!-- Name of the fact that contains the source -->
+ <Cell border="1" style="list_label" width="$fact"><var var="i18n::translate('Event')" /></Cell>
+ <!-- Date of the fact -->
+ <Cell bgcolor="#AAAAAA" border="1" style="list_label" width="$dateevent"><var var="translate_fact('DATE')" /></Cell>
+ <!-- Date of the fact -->
+ <Cell border="1" style="list_label" width="$placeevent"><var var="translate_fact('PLAC')" /></Cell>
+ <!-- Detailed source text -->
+ <Cell border="1" newline="1" style="list_label"><var var="translate_fact('SOUR:PAGE')" /></Cell>
+
+ <!-- Family List -->
+ <TextBox height="$vspace" newline="1" padding="0"/>
+ <SetVar name="printedsource" value="0" />
+ <List list="family" filter1=":SOUR CONTAINS @$sid@" sortby="MARR:DATE">
+ <SetVar name="moresource" value="0" />
+ <SetVar name="printsource" value="0" />
+ <!-- Printed List counter -->
+ <SetVar name="printedsource" value="$printedsource + 1" />
+
+ <!-- Family Name -->
+ <Cell style="list_value" width="$namefam"><GetPersonName id="" />
+ <Gedcom id="@HUSB:@FAMC">
+ <br /> <var var="i18n::translate('Husband\'s parents')" />: <GetPersonName id=""/>
+ </Gedcom>
+ <Gedcom id="@WIFE:@FAMC">
+ <br /> <var var="i18n::translate('Wife\'s parents')" />: <GetPersonName id=""/>
+ </Gedcom>
+ </Cell>
+ <Facts ignore="$ignore">
+ <SetVar name="printfact" value="0" />
+ <RepeatTag tag="@fact:SOUR">
+ <Gedcom id="@SOUR">
+ <if condition="@ID==$sid">
+ <SetVar name="printfact" value="1" />
+ </if>
+ </Gedcom>
+ </RepeatTag>
+
+ <if condition="$printfact==1">
+ <SetVar name="printsource" value="0" />
+ <!-- Intend the fact line if more then one fact has source -->
+ <if condition="$moresource==1">
+ <Cell style="list_value" width="$namefam"> </Cell>
+ </if>
+
+ <!-- Name of the fact that contains the source -->
+ <Cell style="list_value" width="$fact">
+ <if condition="@fact=='MARR'">
+ <!-- Print different type of marriages -->
+ <if condition="@MARR:TYPE==''">
+ <var var="@fact" />
+ </if>
+ <if condition="@MARR:TYPE=='Religious'">
+ <var var="i18n::translate('Religious marriage')" />
+ </if>
+ <if condition="@MARR:TYPE=='Civil'">
+ <var var="i18n::translate('Civil marriage')" />
+ </if>
+ <if condition="@MARR:TYPE=='Partners'">
+ <var var="i18n::translate('Registered partnership')" />
+ </if>
+ </if>
+ <if condition="@fact!='MARR'">
+ <var var="@fact" />
+ </if>
+ <RepeatTag tag="@fact:NOTE">
+ <if condition="@NOTE!=''">
+ <br /><GedcomValue tag="NOTE"/>
+ </if>
+ </RepeatTag>
+ </Cell>
+
+ <!-- Date of the fact -->
+ <Cell style="list_value" width="$dateevent"><GedcomValue tag="@fact:DATE"/></Cell>
+ <!-- Place of the fact -->
+ <Cell style="list_value" width="$placeevent"><GedcomValue tag="@fact:PLAC"/></Cell>
+ <!-- Detailed source text -->
+ <Cell style="list_value" newline="1">
+ <RepeatTag tag="@fact:SOUR">
+ <Gedcom id="@SOUR">
+ <if condition="@ID==$sid">
+ <SetVar name="printsource" value="1" />
+ </if>
+ </Gedcom>
+ <if condition="$printsource==1">
+ <GedcomValue tag="SOUR:PAGE"/>
+ <if condition="@SOUR:DATA:TEXT!=''">
+ <br /><GedcomValue tag="SOUR:DATA:TEXT"/>
+ </if>
+ <SetVar name="printsource" value="0" />
+ </if>
+ </RepeatTag>
+ </Cell>
+ <SetVar name="moresource" value="1" />
+ </if>
+ <SetVar name="printfact" value="0" />
+ </Facts>
+ <Line />
+ </List>
+
+ <!-- Print the list counter -->
+ <if condition="$printedsource==0">
+ <Cell align="rightrtl" newline="1" style="list_label"><var var="i18n::translate('Total families')"/>: 0</Cell>
+ </if>
+ <if condition="$printedsource > 0">
+ <TextBox height="$vspace" newline="1" padding="0"/>
+ <Cell align="rightrtl" newline="1" style="list_label"><var var="i18n::translate('Total families')"/>: <var var="printedsource" /></Cell>
+ </if>
+ <TextBox height="$vspace" newline="1" padding="0"/>
+ </Body>
+
+ <Footer>
+ <Cell align="rightrtl" newline="1" style="date"><Now/></Cell>
+ </Footer>
+
+ </Doc>
+</Report>
|