From 59b1251759cb204e301bc51072c52f2fc10f41f5 Mon Sep 17 00:00:00 2001 From: Deyan Ginev Date: Mon, 24 Jun 2019 15:19:13 -0400 Subject: [PATCH 1/2] raw interpretation of blindtext.sty (#1160) --- MANIFEST | 1 + lib/LaTeXML/Package/blindtext.sty.ltxml | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 lib/LaTeXML/Package/blindtext.sty.ltxml diff --git a/MANIFEST b/MANIFEST index 9e2daaa4d..c1d5b1566 100644 --- a/MANIFEST +++ b/MANIFEST @@ -391,6 +391,7 @@ lib/LaTeXML/Package/bbm.sty.ltxml lib/LaTeXML/Package/bbold.sty.ltxml lib/LaTeXML/Package/beton.sty.ltxml lib/LaTeXML/Package/bibunits.sty.ltxml +lib/LaTeXML/Package/blindtext.sty.ltxml lib/LaTeXML/Package/bm.sty.ltxml lib/LaTeXML/Package/book.cls.ltxml lib/LaTeXML/Package/bookman.sty.ltxml diff --git a/lib/LaTeXML/Package/blindtext.sty.ltxml b/lib/LaTeXML/Package/blindtext.sty.ltxml new file mode 100644 index 000000000..0bd4d8756 --- /dev/null +++ b/lib/LaTeXML/Package/blindtext.sty.ltxml @@ -0,0 +1,25 @@ +# -*- mode: Perl -*- +# /=====================================================================\ # +# | blindtext.sty | # +# | Implementation for LaTeXML | # +# |=====================================================================| # +# | Part of LaTeXML: | # +# | Public domain software, produced as part of work done by the | # +# | United States Government & not subject to copyright in the US. | # +# |---------------------------------------------------------------------| # +# | Bruce Miller #_# | # +# | http://dlmf.nist.gov/LaTeXML/ (o o) | # +# \=========================================================ooo==U==ooo=/ # +package LaTeXML::Package::Pool; +use strict; +use warnings; +use LaTeXML::Package; + +#====================================================================== +# Note: \languagename is assumed as defined by blindtext, and it so happens that +# pdflatex has parts of babel defined by default. For now, just request babel loaded +RequirePackage('babel', options => ['english']); + +InputDefinitions('blindtext', type => 'sty', noltxml => 1); + +1; From f45e13394f4e7ed55b359b1957d7d3712c2417de Mon Sep 17 00:00:00 2001 From: Deyan Ginev Date: Mon, 24 Jun 2019 15:20:14 -0400 Subject: [PATCH 2/2] Update with baseline aastex62 definitions (#1159) * update with baseline aastex62 definitions * use lx@contact metadata macro for correspondence --- MANIFEST | 2 -- lib/LaTeXML/Package/aas_support.sty.ltxml | 26 +++++++++++++++++++++++ lib/LaTeXML/Package/aastex6.cls.ltxml | 26 ----------------------- lib/LaTeXML/Package/aastex61.cls.ltxml | 26 ----------------------- t/complex/aastex_test.xml | 1 + 5 files changed, 27 insertions(+), 54 deletions(-) delete mode 100644 lib/LaTeXML/Package/aastex6.cls.ltxml delete mode 100644 lib/LaTeXML/Package/aastex61.cls.ltxml diff --git a/MANIFEST b/MANIFEST index c1d5b1566..f944d07aa 100644 --- a/MANIFEST +++ b/MANIFEST @@ -335,8 +335,6 @@ lib/LaTeXML/Package/aasms.sty.ltxml lib/LaTeXML/Package/aaspp.sty.ltxml lib/LaTeXML/Package/aastex.cls.ltxml lib/LaTeXML/Package/aastex.sty.ltxml -lib/LaTeXML/Package/aastex6.cls.ltxml -lib/LaTeXML/Package/aastex61.cls.ltxml lib/LaTeXML/Package/accents.sty.ltxml lib/LaTeXML/Package/acmart.cls.ltxml lib/LaTeXML/Package/acronym.sty.ltxml diff --git a/lib/LaTeXML/Package/aas_support.sty.ltxml b/lib/LaTeXML/Package/aas_support.sty.ltxml index a1d0295c3..31cac3f2b 100644 --- a/lib/LaTeXML/Package/aas_support.sty.ltxml +++ b/lib/LaTeXML/Package/aas_support.sty.ltxml @@ -26,6 +26,15 @@ use LaTeXML::Package; # but I don't see it ever made explicit. #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% RequirePackage('aas_macros'); + +### New as of august 2015: +RequirePackage('url'); +RequirePackage('longtable'); +RequirePackage('xcolor'); +RequirePackage('hyperref'); +RequirePackage('array'); +RequirePackage('lineno'); +RequirePackage('ulem'); #====================================================================== # 2.1.3 Editorial Information @@ -65,6 +74,9 @@ DefMacro('\slugcomment{}', '\@add@frontmatter{ltx:note}[role=slugcomment]{#1}'); DefMacro('\shorttitle{}', '\@add@frontmatter{ltx:toctitle}{#1}'); DefMacro('\shortauthors{}', ''); # not useful? +# Meant to be used redundantly with an \author macro, so just register the correspondence here +DefMacro('\correspondingauthor{}', '\lx@contact{correspondent}{#1}'); + # I had thought that \lefthead,\righthead were obsolete forms of \shorttitle,\shortauthors, # but who knows which goes on which side.... anyway, they get misused too. # better have them just disappear. @@ -468,4 +480,18 @@ DefMacroI('\refpar', undef, ''); DefMacroI('\traceoutput', undef, ''); DefMacroI('\tracingplain', undef, ''); #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +### These commands requested AAS +DefMacro('\noprint {}', ''); +DefMacro('\figsetstart', '{\bf Fig. Set}'); +DefMacro('\figsetend', ''); +DefMacro('\figsetgrpstart', ''); +DefMacro('\figsetgrpend', ''); +DefMacro('\figsetnum {}', '{\bf #1.}'); +DefMacro('\figsettitle {}', '{\bf #1}'); +DefMacro('\figsetgrpnum {}', ''); +DefMacro('\figsetgrptitle {}', ''); +DefMacro('\figsetplot {}', ''); +DefMacro('\figsetgrpnote {}', ''); + 1; diff --git a/lib/LaTeXML/Package/aastex6.cls.ltxml b/lib/LaTeXML/Package/aastex6.cls.ltxml deleted file mode 100644 index 032a903da..000000000 --- a/lib/LaTeXML/Package/aastex6.cls.ltxml +++ /dev/null @@ -1,26 +0,0 @@ -# -*- mode: Perl -*- -# /=====================================================================\ # -# | aastex6 | # -# | Implementation for LaTeXML | # -# |=====================================================================| # -# | Part of LaTeXML: | # -# | Public domain software, produced as part of work done by the | # -# | United States Government & not subject to copyright in the US. | # -# |---------------------------------------------------------------------| # -# | Thanks to the arXMLiv group for initial implementation | # -# | http://arxmliv.kwarc.info/ | # -# | Released to the Public Domain | # -# |---------------------------------------------------------------------| # -# | Bruce Miller #_# | # -# | http://dlmf.nist.gov/LaTeXML/ (o o) | # -# \=========================================================ooo==U==ooo=/ # -package LaTeXML::Package::Pool; -use strict; -use warnings; -use LaTeXML::Package; - -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LoadClass('aastex'); - -# #====================================================================== -1; diff --git a/lib/LaTeXML/Package/aastex61.cls.ltxml b/lib/LaTeXML/Package/aastex61.cls.ltxml deleted file mode 100644 index 8e1357441..000000000 --- a/lib/LaTeXML/Package/aastex61.cls.ltxml +++ /dev/null @@ -1,26 +0,0 @@ -# -*- mode: Perl -*- -# /=====================================================================\ # -# | aastex61 | # -# | Implementation for LaTeXML | # -# |=====================================================================| # -# | Part of LaTeXML: | # -# | Public domain software, produced as part of work done by the | # -# | United States Government & not subject to copyright in the US. | # -# |---------------------------------------------------------------------| # -# | Thanks to the arXMLiv group for initial implementation | # -# | http://arxmliv.kwarc.info/ | # -# | Released to the Public Domain | # -# |---------------------------------------------------------------------| # -# | Bruce Miller #_# | # -# | http://dlmf.nist.gov/LaTeXML/ (o o) | # -# \=========================================================ooo==U==ooo=/ # -package LaTeXML::Package::Pool; -use strict; -use warnings; -use LaTeXML::Package; - -#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -LoadClass('aastex'); - -# #====================================================================== -1; diff --git a/t/complex/aastex_test.xml b/t/complex/aastex_test.xml index cc0ee8e1b..e517c9098 100644 --- a/t/complex/aastex_test.xml +++ b/t/complex/aastex_test.xml @@ -4,6 +4,7 @@ +

Expected “