Merge branch 'master' of github.com:brucemiller/LaTeXML

seanpm2001 · Jun 25, 2019 · 6fcb982 · 6fcb982
2 parents 41ff0d7 + f45e133
commit 6fcb982
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 36 deletions.
diff --git 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
@@ -391,6 +389,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/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/aastex61.cls.ltxml b/lib/LaTeXML/Package/aastex61.cls.ltxml
diff --git a/lib/LaTeXML/Package/aastex6.cls.ltxml → lib/LaTeXML/Package/blindtext.sty.ltxml b/lib/LaTeXML/Package/aastex6.cls.ltxml → lib/LaTeXML/Package/blindtext.sty.ltxml
@@ -1,16 +1,12 @@
 # -*- mode: Perl -*-
 # /=====================================================================\ #
-# |  aastex6                                                            | #
+# | 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.     | #
 # |---------------------------------------------------------------------| #
-# | Thanks to the arXMLiv group for initial implementation              | #
-# |    http://arxmliv.kwarc.info/                                       | #
-# | Released to the Public Domain                                       | #
-# |---------------------------------------------------------------------| #
 # | Bruce Miller <bruce.miller@nist.gov>                        #_#     | #
 # | http://dlmf.nist.gov/LaTeXML/                              (o o)    | #
 # \=========================================================ooo==U==ooo=/ #
@@ -19,8 +15,11 @@ use strict;
 use warnings;
 use LaTeXML::Package;
 
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-LoadClass('aastex');
+#======================================================================
+# 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;
diff --git a/t/complex/aastex_test.xml b/t/complex/aastex_test.xml
@@ -4,6 +4,7 @@
 <document xmlns="http://dlmf.nist.gov/LaTeXML">
   <resource src="LaTeXML.css" type="text/css"/>
   <resource src="ltx-article.css" type="text/css"/>
+  <resource src="ltx-ulem.css" type="text/css"/>
   <para xml:id="p1">
     <p>Expected “<Math mode="inline" tex="\theta" text="theta" xml:id="p1.m1">
         <XMath>