diff --git a/autotests/export/docbook/bibliography_precooked_aastex.xml b/autotests/export/docbook/bibliography_precooked_aastex.xml index 71fe700e56..70b19af60c 100644 --- a/autotests/export/docbook/bibliography_precooked_aastex.xml +++ b/autotests/export/docbook/bibliography_precooked_aastex.xml @@ -382,9 +382,7 @@ clusters: globular, peanut—bosons: bozos may be formed from particle four-momenta, gauge-boson polarization vectors or fermion strings with an uncontracted Lorentz index associated with final-state fermions. - -Figures 1 and 2 should appear side-by-side in print - +Figures 1 and 2 should appear side-by-side in print In the chiral representation the \gamma @@ -634,7 +632,6 @@ Figures 1 and 2 should appear side-by-side in print by - u(p,\lambda)_{\pm} & = & (E\pm\lambda|{\textbf{p}}|)^{1/2}\chi_{\lambda}(p),\\ v(p,\lambda)_{\pm} & = & \pm\lambda(E\mp\lambda|{\textbf{p}}|)^{1/2}\chi_{-\lambda}(p) @@ -724,9 +721,7 @@ v(p,\lambda)_{\pm} & = & \pm\lambda(E\mp\lambda|{\textbf{p}}|)^{1/2}\chi - - - +
Floating material and so forth @@ -1008,7 +1003,7 @@ v(p,\lambda)_{\pm} & = & \pm\lambda(E\mp\lambda|{\textbf{p}}|)^{1/2}\chi of the electronically submitted abstracts for AAS meetings are error-free. - + We are grateful to V. Barger, T. Han, and R. J. N. Phillips for doing the math in section . More information on the AASTeX macros package are available at http://www.aas.org/publications/aastex or the AAS ftp site. IRAF, AIPS, Astropy, ... @@ -1139,7 +1134,7 @@ IRAF, AIPS, Astropy, ... P -a +a PR_{maj} @@ -1183,7 +1178,7 @@ IRAF, AIPS, Astropy, ... Θ -b +b Ref. @@ -1235,7 +1230,7 @@ IRAF, AIPS, Astropy, ... 4 32733.8 --1.2c +-1.2c -0.5 41 54.8 @@ -1254,7 +1249,7 @@ IRAF, AIPS, Astropy, ... -0.4 60 1.4 -1.669c +1.669c 1.574 2.343 8.0 @@ -1279,23 +1274,13 @@ IRAF, AIPS, Astropy, ... - -a -Sample footnote for table  that was generated with the LaTeX table environment -
- -b -Yet another sample footnote for table  -
- -c -Another sample footnote for table  -
- -We can also attach a long-ish paragraph of explanatory material to a table. Use \tablerefs to append a list of references. The following references were from a different table: I've patched them in here to show how they look, but don't take them too seriously—I certainly have not. - - -(1) Barbuy, Spite, & Spite 1985; (2) Bond 1980; (3) Carbon et al. 1987; (4) Hobbs & Duncan 1987; (5) Gilroy et al. 1988: (6) Gratton & Ortolani 1986; (7) Gratton & Sneden 1987; (8) Gratton & Sneden (1988); (9) Gratton & Sneden 1991; (10) Kraft et al. 1982; (11) LCL, or Laird, 1990; (12) Leep & Wallerstein 1981; (13) Luck & Bond 1981; (14) Luck & Bond 1985; (15) Magain 1987; (16) Magain 1989; (17) Peterson 1981; (18) Peterson, Kurucz, & Carney 1990; (19) RMB; (20) Schuster & Nissen 1988; (21) Schuster & Nissen 1989b; (22) Spite et al. 1984; (23) Spite & Spite 1986; (24) Hobbs & Thorburn 1991; (25) Hobbs et al. 1991; (26) Olsen 1983. - +a +Sample footnote for table  that was generated with the LaTeX table environment +b +Yet another sample footnote for table  +c +Another sample footnote for table  +We can also attach a long-ish paragraph of explanatory material to a table. Use \tablerefs to append a list of references. The following references were from a different table: I've patched them in here to show how they look, but don't take them too seriously—I certainly have not. +(1) Barbuy, Spite, & Spite 1985; (2) Bond 1980; (3) Carbon et al. 1987; (4) Hobbs & Duncan 1987; (5) Gilroy et al. 1988: (6) Gratton & Ortolani 1986; (7) Gratton & Sneden 1987; (8) Gratton & Sneden (1988); (9) Gratton & Sneden 1991; (10) Kraft et al. 1982; (11) LCL, or Laird, 1990; (12) Leep & Wallerstein 1981; (13) Luck & Bond 1981; (14) Luck & Bond 1985; (15) Magain 1987; (16) Magain 1989; (17) Peterson 1981; (18) Peterson, Kurucz, & Carney 1990; (19) RMB; (20) Schuster & Nissen 1988; (21) Schuster & Nissen 1989b; (22) Spite et al. 1984; (23) Spite & Spite 1986; (24) Hobbs & Thorburn 1991; (25) Hobbs et al. 1991; (26) Olsen 1983. \ No newline at end of file diff --git a/development/DocBookToDo b/development/DocBookToDo new file mode 100644 index 0000000000..39ca534ecb --- /dev/null +++ b/development/DocBookToDo @@ -0,0 +1,20 @@ +Things specific to layouts +========================== + +AASTeX +------ + +No support for table notes. They could be implemented through , but it becomes a nightmare to ensure xml:id uniqueness (the only ID available here is in the inset; mix it with the table ID?). Anyway, it would require a lot of specific code to make it work, probably not worth the effort right now. + + Related parts of the layout: + Style "Table note" + InsetLayout "Flex:tablenotemark" + Alreayd used in the following test: + bibliography_precooked_aastex.lyx + +Notion of MathLetters: a group of equations. No good mapping in DocBook, maybe an informalgroup? To discuss with DocBook TC. +TableRefs, TableComments: no mapping in DocBook, not really a way to add these things. To discuss with DocBook TC. + +Clearly, with this kind of template, we're reaching the limits of such a system! Having a really good converter for all these cases would require a lot of very specific code. + +More general: what the heck with appendices? It's not handled in the LyX way (Document > Start Appendix Here), but in a custom way. Making this work would solve some correctness issues with this template. \ No newline at end of file diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index d79cd02d07..78089a45c9 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -285,6 +285,11 @@ Style Abstract Series Bold Size Normal EndFont + DocBookAbstract true + DocBookInInfo always + DocBookWrapperTag abstract + DocBookWrapperMergeWithPrevious true + DocBookTag para End @@ -335,6 +340,7 @@ Style Keywords Size Normal EndFont DocBookTag keyword + DocBookTagType paragraph DocBookWrapperTag keywordset DocBookInInfo always End @@ -359,7 +365,7 @@ Style Acknowledgements Shape Italic EndFont DocBookTag para - DocBookWrapperTag acknowledgement + DocBookWrapperTag acknowledgements End @@ -432,6 +438,7 @@ Style MathLetters Font Size Normal EndFont + DocBookTag NONE End @@ -495,6 +502,9 @@ Style NoteToEditor Size Normal Shape Italic EndFont + DocBookTag remark + DocBookTagType paragraph + DocBookAttr role='to-editor' End @@ -515,6 +525,9 @@ Style TableRefs Family Roman Size Normal EndFont + DocBookTag remark + DocBookTagType paragraph + DocBookAttr role='tablerefs' End @@ -535,6 +548,9 @@ Style TableComments Family Roman Size Normal EndFont + DocBookTag remark + DocBookTagType paragraph + DocBookAttr role='tablecomments' End @@ -550,6 +566,9 @@ Style "Table note" LabelFont Color magenta EndFont + DocBookTag remark + DocBookTagType paragraph + DocBookAttr role='tablenote' End @@ -572,6 +591,9 @@ InsetLayout "Flex:tablenotemark" Color magenta Size Small EndFont + DocBookTag remark + DocBookTagType paragraph + DocBookAttr role='tablenotemark' End diff --git a/lib/layouts/aastex6.layout b/lib/layouts/aastex6.layout index 03d585ef8a..693536530a 100644 --- a/lib/layouts/aastex6.layout +++ b/lib/layouts/aastex6.layout @@ -67,8 +67,11 @@ Style Software LabelFont Shape Italic EndFont - DocBookWrapperTag para - DocBookTag application + DocBookTag remark + DocBookAttr role='software' + # Override what's taken from Keywords, but not really wanted. + DocBookWrapperTag NONE + DocBookInInfo never End # other new commands are mainly for the user preamble diff --git a/lib/layouts/aastex62.layout b/lib/layouts/aastex62.layout index 3eb7dcc44c..1ef86366c0 100644 --- a/lib/layouts/aastex62.layout +++ b/lib/layouts/aastex62.layout @@ -78,8 +78,11 @@ Style Software LabelFont Shape Italic EndFont - DocBookWrapperTag para - DocBookTag application + DocBookTag remark + DocBookAttr role='software' + # Override what's taken from Keywords, but not really wanted. + DocBookWrapperTag NONE + DocBookInInfo never End # other new commands are mainly for the user preamble