Skip to content

Commit

Permalink
Move all pool files to LaTeXML/Engine; have LoadPool look there for p…
Browse files Browse the repository at this point in the history
…ools; move and rename all pool-level modules
  • Loading branch information
brucemiller committed Apr 25, 2024
1 parent e8380dd commit 7046f6b
Show file tree
Hide file tree
Showing 35 changed files with 139 additions and 125 deletions.
68 changes: 36 additions & 32 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -312,44 +312,51 @@ lib/LaTeXML/resources/Profiles/math.opt
lib/LaTeXML/resources/Profiles/modern.opt
lib/LaTeXML/resources/Profiles/standard.opt

#==================================================
# Supported Engines/Formats
#==================================================
lib/LaTeXML/Engine/AmSTeX.pool.ltxml
lib/LaTeXML/Engine/BibTeX.pool.ltxml
lib/LaTeXML/Engine/TeX.pool.ltxml
lib/LaTeXML/Engine/Schema.pool.ltxml
lib/LaTeXML/Engine/ParameterTypes.pool.ltxml
lib/LaTeXML/Engine/XMath.pool.ltxml
lib/LaTeXML/Engine/Utility.pool.ltxml
lib/LaTeXML/Engine/Deprecated.pool.ltxml
lib/LaTeXML/Engine/Box.pool.ltxml
lib/LaTeXML/Engine/Character.pool.ltxml
lib/LaTeXML/Engine/Debugging.pool.ltxml
lib/LaTeXML/Engine/FileIO.pool.ltxml
lib/LaTeXML/Engine/Fonts.pool.ltxml
lib/LaTeXML/Engine/Glue.pool.ltxml
lib/LaTeXML/Engine/Hyphenation.pool.ltxml
lib/LaTeXML/Engine/Inserts.pool.ltxml
lib/LaTeXML/Engine/Job.pool.ltxml
lib/LaTeXML/Engine/Kern.pool.ltxml
lib/LaTeXML/Engine/Logic.pool.ltxml
lib/LaTeXML/Engine/Macro.pool.ltxml
lib/LaTeXML/Engine/Marks.pool.ltxml
lib/LaTeXML/Engine/Math.pool.ltxml
lib/LaTeXML/Engine/Page.pool.ltxml
lib/LaTeXML/Engine/Paragraph.pool.ltxml
lib/LaTeXML/Engine/Penalties.pool.ltxml
lib/LaTeXML/Engine/Registers.pool.ltxml
lib/LaTeXML/Engine/Tables.pool.ltxml
lib/LaTeXML/Engine/plain.pool.ltxml
lib/LaTeXML/Engine/LaTeX.pool.ltxml
lib/LaTeXML/Engine/eTeX.pool.ltxml
lib/LaTeXML/Engine/expl3.pool.ltxml
lib/LaTeXML/Engine/pdfTeX.pool.ltxml

#==================================================
# Supported Packages
#==================================================
lib/LaTeXML/Package.pm
lib/LaTeXML/Package/AmSTeX.pool.ltxml
lib/LaTeXML/Package/BibTeX.pool.ltxml
lib/LaTeXML/Package/JHEP.cls.ltxml
lib/LaTeXML/Package/JHEP2.cls.ltxml
lib/LaTeXML/Package/JHEP3.cls.ltxml
lib/LaTeXML/Package/LaTeX.pool.ltxml
lib/LaTeXML/Package/OmniBus.cls.ltxml
lib/LaTeXML/Package/PoS.cls.ltxml
lib/LaTeXML/Package/TeX.pool.ltxml
lib/LaTeXML/Package/LaTeXML-Schema.pool.ltxml
lib/LaTeXML/Package/LaTeXML-Types.pool.ltxml
lib/LaTeXML/Package/LaTeXML-Math.pool.ltxml
lib/LaTeXML/Package/LaTeXML-Utility.pool.ltxml
lib/LaTeXML/Package/LaTeXML-Deprecated.pool.ltxml
lib/LaTeXML/Package/TeX-Box.pool.ltxml
lib/LaTeXML/Package/TeX-Character.pool.ltxml
lib/LaTeXML/Package/TeX-Debugging.pool.ltxml
lib/LaTeXML/Package/TeX-FileIO.pool.ltxml
lib/LaTeXML/Package/TeX-Fonts.pool.ltxml
lib/LaTeXML/Package/TeX-Glue.pool.ltxml
lib/LaTeXML/Package/TeX-Hyphenation.pool.ltxml
lib/LaTeXML/Package/TeX-Inserts.pool.ltxml
lib/LaTeXML/Package/TeX-Job.pool.ltxml
lib/LaTeXML/Package/TeX-Kern.pool.ltxml
lib/LaTeXML/Package/TeX-Logic.pool.ltxml
lib/LaTeXML/Package/TeX-Macro.pool.ltxml
lib/LaTeXML/Package/TeX-Marks.pool.ltxml
lib/LaTeXML/Package/TeX-Math.pool.ltxml
lib/LaTeXML/Package/TeX-Page.pool.ltxml
lib/LaTeXML/Package/TeX-Paragraph.pool.ltxml
lib/LaTeXML/Package/TeX-Penalties.pool.ltxml
lib/LaTeXML/Package/TeX-Registers.pool.ltxml
lib/LaTeXML/Package/TeX-Tables.pool.ltxml
lib/LaTeXML/Package/plain.pool.ltxml
lib/LaTeXML/Package/a0poster.cls.ltxml
lib/LaTeXML/Package/a0size.sty.ltxml
lib/LaTeXML/Package/a4.sty.ltxml
Expand Down Expand Up @@ -474,7 +481,6 @@ lib/LaTeXML/Package/dsfont.sty.ltxml
lib/LaTeXML/Package/empheq.sty.ltxml
lib/LaTeXML/Package/endnotes.sty.ltxml
lib/LaTeXML/Package/english.sty.ltxml
lib/LaTeXML/Package/eTeX.pool.ltxml
lib/LaTeXML/Package/ellipsis.sty.ltxml
lib/LaTeXML/Package/elsart.cls.ltxml
lib/LaTeXML/Package/elsart.sty.ltxml
Expand All @@ -485,7 +491,6 @@ lib/LaTeXML/Package/ed.sty.ltxml
lib/LaTeXML/Package/expl3.sty.ltxml
lib/LaTeXML/Package/expl3.ltx.ltxml
lib/LaTeXML/Package/expl3.lua.ltxml
lib/LaTeXML/Package/expl3.pool.ltxml
lib/LaTeXML/Package/emulateapj.cls.ltxml
lib/LaTeXML/Package/emulateapj.sty.ltxml
lib/LaTeXML/Package/emulateapj5.sty.ltxml
Expand Down Expand Up @@ -648,7 +653,6 @@ lib/LaTeXML/Package/overpic.sty.ltxml
lib/LaTeXML/Package/palatino.sty.ltxml
lib/LaTeXML/Package/paralist.sty.ltxml
lib/LaTeXML/Package/parskip.sty.ltxml
lib/LaTeXML/Package/pdfTeX.pool.ltxml
lib/LaTeXML/Package/pdflscape.sty.ltxml
lib/LaTeXML/Package/pdfpages.sty.ltxml
lib/LaTeXML/Package/pdfsync.sty.ltxml
Expand Down
1 change: 1 addition & 0 deletions lib/LaTeXML/Core.pm
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ sub initializeState {
$preload .= '.' . $type;
}
LaTeXML::Package::InputDefinitions($preload, type => $type,
($type eq 'pool' ? (installation_subdir => 'Engine') : ()),
handleoptions => $handleoptions, options => $options);
}
$state->assignValue('InitialPreloads' => undef, 'global');
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Box | #
# | Box | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Character | #
# | Character | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Debugging | #
# | Debugging | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | LaTeXML-Deprecated | #
# | Deprecated | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-FileIO | #
# | FileIO | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Fonts | #
# | Fonts | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Glue | #
# | Glue | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Hyphenation | #
# | Hyphenation | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Inserts | #
# | Inserts | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Job | #
# | Job | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Kern | #
# | Kern | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use List::Util qw(min max);
#**********************************************************************

LoadPool('TeX');

LOAD_LATEX();
# Apparently LaTeX does NOT define \magnification,
# and babel uses that to determine whether we're runing LaTeX!!!
Let('\magnification', '\@undefined');
Expand Down Expand Up @@ -4384,8 +4384,10 @@ DefConstructor('\lx@mark@nocite Semiverbatim',
#======================================================================
# C.11.4 Splitting the input
#======================================================================
Let('\@@input', '\input'); # Save TeX's version.
# LaTeX's \input is a bit different...
if (!($LaTeXML::DEBUG{compiled} || $LaTeXML::DEBUG{compiling})) {
Let('\@@input', '\input'); # Save TeX's version.
# LaTeX's \input is a bit different...
}
# Input, now
DefPrimitive('\ltx@input {}', sub { Input(Expand($_[1])); });
DefMacroI('\input', undef, '\@ifnextchar\bgroup\@iinput\@@input');
Expand Down Expand Up @@ -4885,8 +4887,8 @@ DefPrimitive('\newsavebox DefToken', sub {
AssignValue(allocated_boxes => $n, 'global');
DefRegisterI($_[1], undef, Number($n));
AssignValue('box' . $n, List()); });

RawTeX(<<'EOL');
if (!($LaTeXML::DEBUG{compiled} || $LaTeXML::DEBUG{compiling})) {
RawTeX(<<'EOL');
\def\newsavebox#1{\@ifdefinable{#1}{\newbox#1}}
\DeclareRobustCommand\savebox[1]{%
\@ifnextchar(%)
Expand Down Expand Up @@ -4916,7 +4918,7 @@ RawTeX(<<'EOL');
\def\endlrbox{\unskip\color@endgroup}
\DeclareRobustCommand\usebox[1]{\leavevmode\copy #1\relax}
EOL

}
Let('\lx@parboxnewline', '\lx@newline'); # Obsolete, but in case still used
# NOTE: There are 2 extra arguments (See LaTeX Companion, p.866)
# for height and inner-pos. We're ignoring inner-pos, for now, though.
Expand Down Expand Up @@ -6402,39 +6404,41 @@ RequirePackage('textcomp');
# of pre-read/pre-processed latex.ltx !
#
# For now, a few macros required by other packages will be included:
DefMacroI(T_CS('\hook_gput_code:nnn'), '{}{}{}', '');
DefMacro('\NewHook{}', '');
DefMacro('\NewReversedHook{}', '');
DefMacro('\NewMirroredHookPair{}{}', '');
DefMacro('\ActivateGenericHook{}', '');
DefMacro('\DisableGenericHook{}', '');
DefMacro('\AddToHook{}[]{}', '');
DefMacro('\AddToHookNext{}{}', '');
DefMacro('\ClearHookNext{}', '');
DefMacro('\RemoveFromHook{}[]', '');
DefMacro('\SetDefaultHookLabel{}', '');
DefMacro('\PushDefaultHookLabel{}', '');
DefMacro('\PopDefaultHookLabel', '');
DefMacro('\UseHook{}', '');
DefMacro('\UseOneTimeHook{}', '');
DefMacro('\ShowHook{}', '');
DefMacro('\LogHook{}', '');
DefMacro('\DebugHooksOn', '');
DefMacro('\DebugHooksOff', '');
DefMacro('\DeclareHookRule{}{}{}{}', '');
DefMacro('\DeclareDefaultHookRule{}{}{}', '');
DefMacro('\ClearHookRule{}{}{}', '');
DefMacro('\IfHookEmptyTF{}{}{}', '#3');
DefMacro('\IfHookExistsTF{}{}{}', '#3');
DefMacro('\MakeTextLowercase', '\lowercase');
DefMacro('\MakeTextUppercase', '\uppercase');

DefConditional('\if@includeinrelease');
Let('\@kernel@after@enddocument', '\@empty');
Let('\@kernel@after@enddocument@afterlastpage', '\@empty');
Let('\@kernel@before@begindocument', '\@empty');
Let('\@kernel@after@begindocument', '\@empty');
Let('\conditionally@traceon', '\@empty');
Let('\conditionally@traceoff', '\@empty');
if (!($LaTeXML::DEBUG{compiled} || $LaTeXML::DEBUG{compiling})) {
DefMacroI(T_CS('\hook_gput_code:nnn'), '{}{}{}', '');
DefMacro('\NewHook{}', '');
DefMacro('\NewReversedHook{}', '');
DefMacro('\NewMirroredHookPair{}{}', '');
DefMacro('\ActivateGenericHook{}', '');
DefMacro('\DisableGenericHook{}', '');
DefMacro('\AddToHook{}[]{}', '');
DefMacro('\AddToHookNext{}{}', '');
DefMacro('\ClearHookNext{}', '');
DefMacro('\RemoveFromHook{}[]', '');
DefMacro('\SetDefaultHookLabel{}', '');
DefMacro('\PushDefaultHookLabel{}', '');
DefMacro('\PopDefaultHookLabel', '');
DefMacro('\UseHook{}', '');
DefMacro('\UseOneTimeHook{}', '');
DefMacro('\ShowHook{}', '');
DefMacro('\LogHook{}', '');
DefMacro('\DebugHooksOn', '');
DefMacro('\DebugHooksOff', '');
DefMacro('\DeclareHookRule{}{}{}{}', '');
DefMacro('\DeclareDefaultHookRule{}{}{}', '');
DefMacro('\ClearHookRule{}{}{}', '');
DefMacro('\IfHookEmptyTF{}{}{}', '#3');
DefMacro('\IfHookExistsTF{}{}{}', '#3');
DefMacro('\MakeTextLowercase', '\lowercase');
DefMacro('\MakeTextUppercase', '\uppercase');

DefConditional('\if@includeinrelease');
Let('\@kernel@after@enddocument', '\@empty');
Let('\@kernel@after@enddocument@afterlastpage', '\@empty');
Let('\@kernel@before@begindocument', '\@empty');
Let('\@kernel@after@begindocument', '\@empty');
Let('\conditionally@traceon', '\@empty');
Let('\conditionally@traceoff', '\@empty');
}
#**********************************************************************
1;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Logic | #
# | Logic | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Macro | #
# | Macro | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Marks | #
# | Marks | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Math | #
# | Math | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Page | #
# | Page | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Paragraph | #
# | Paragraph | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | LaTeXML-Types | #
# | ParameterTypes | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Penalties | #
# | Penalties | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: Perl -*-
# /=====================================================================\ #
# | TeX-Registers | #
# | Registers | #
# | Core TeX Implementation for LaTeXML | #
# |=====================================================================| #
# | Part of LaTeXML: | #
Expand Down
Loading

0 comments on commit 7046f6b

Please sign in to comment.