Skip to content

Commit

Permalink
Merge branch 'develop' into testsofthyphen
Browse files Browse the repository at this point in the history
  • Loading branch information
u-fischer committed May 23, 2024
2 parents 802684b + d492d90 commit 402d0fc
Show file tree
Hide file tree
Showing 42 changed files with 392 additions and 392 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Version 0.98u
Version 0.98t

### Changed
- add RoleMap also with pdf 2.0 to improve compability to 1.7-processor
- add RoleMap also with pdf 2.0 to improve compatibility to 1.7-processor
- add option 'mathml-tags' to add mathml to this fallback RoleMap

## [2024-01-19]
Expand Down
4 changes: 2 additions & 2 deletions doc/tagpdf.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ \subsubsection{Tips}
command that saves the text internally in a box): If the box is used
directly, there is probably no problem. If the use is later, stash
the marked content and add the needed \verb+\tagmcuse+ directly
before oder after the box when you use it.
before or after the box when you use it.

\item Don't use a saved box with markers twice.

Expand Down Expand Up @@ -2923,7 +2923,7 @@ \subsection{Changes in version 0.93}
\texttt{root-AF}) has been added. This allow e.g. to add a css-file
which is be used if the \PDF\ is converted to html.

\item First steps have been done to adapt the package to planed changes
\item First steps have been done to adapt the package to planned changes
in \LaTeX{}: The command \cs{DocumentMetadata} will be added to the
format and will take over the role of \cs{DeclareDocumentMetadata}
from \pkg{pdfmanagement-testphase} and additionally will also load
Expand Down
2 changes: 1 addition & 1 deletion doc/tagpdfdocu-patches.sty
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
% the before upper setting is dangerous as it can be overwritten by
% users. So a more stable hook is needed.
% we force also a \par and add a div structure, to avoid clashes with the block
% tagging code. This needs revisting!
% tagging code. This needs revisiting!

\AddToHook{env/tcolorbox/before}{\par\tagstructbegin{tag=Div}}
\AddToHook{env/tcolorbox/begin}{\tagpdfparaOff \tcbset{before upper=\tagpdfparaOn}}
Expand Down
2 changes: 1 addition & 1 deletion doc/tagpdfsetup-keys.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sorting the tagpdfsetup keys

The keys are split in a number of key pathes.
The keys are split in a number of key paths.

## Unhandled key

Expand Down
2 changes: 1 addition & 1 deletion doc/tagpdfsetup-keys.tex
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%% Overview over tagpdfsetup keys
%% The keys are split in a number of key pathes.
%% The keys are split in a number of key paths.
\tagpdfsetup{table/header-rows=1}
\begin{tabular}{lllll}
\toprule
Expand Down
8 changes: 4 additions & 4 deletions tagpdf-backend.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ ltx.@@.page will contain page data
ltx.@@.tables contains also data from mc and struct (from older code). This needs cleaning up.
There are certainly dublettes, but I don't dare yet ...
ltx.@@.func will contain (public) functions.
ltx.@@.trace will contain tracing/loging functions.
local funktions starts with __
ltx.@@.trace will contain tracing/logging functions.
local functions starts with __
functions meant for users will be in ltx.tag

functions
Expand All @@ -210,7 +210,7 @@ functions
ltx.@@.func.store_mc_kid (mcnum,kid,page): stores the mc-kids of mcnum on page page
ltx.@@.func.store_mc_in_page(mcnum,mcpagecnt,page): stores in the page table the number of mcnum on this page
ltx.@@.func.store_struct_mcabs (structnum,mcnum): stores relations structnum<->mcnum (abs)
ltx.@@.func.mc_insert_kids (mcnum): inserts the /K entries for mcnum by wandering throught the [kids] table
ltx.@@.func.mc_insert_kids (mcnum): inserts the /K entries for mcnum by wandering through the [kids] table
ltx.@@.func.mark_page_elements(box,mcpagecnt,mccntprev,mcopen,name,mctypeprev) : the main function
ltx.@@.func.mark_shipout (): a wrapper around the core function which inserts the last EMC
ltx.@@.func.fill_parent_tree_line (page): outputs the entries of the parenttree for this page
Expand Down Expand Up @@ -843,7 +843,7 @@ end
% @@_activate_mark_space,
% ltx.@@.func.markspaceoff
% }
% Theses functions add/remove the function which marks the spaces to the callbacks
% These functions add/remove the function which marks the spaces to the callbacks
% |pre_linebreak_filter| and |hpack_filter|
% \begin{macrocode}
local function @@_activate_mark_space ()
Expand Down
4 changes: 2 additions & 2 deletions tagpdf-checks.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
% It relies currently on that the code, that saved the box, correctly sets
% the command \verb+\l_tag_box_\int_use:N #1_tl+ to a positive value.
% The LaTeX commands will do that automatically
% at some time but it is in the responsability of the user to
% at some time but it is in the responsibility of the user to
% ensure that when using low-level code.
% If the internal command doesn't exist the box is assumed to be untagged.
% \end{function}
Expand Down Expand Up @@ -639,7 +639,7 @@
% It relies on that the code that saved the box correctly set
% \verb+\l_tag_box_<box number>_tl+ to a positive value.
% The LaTeX commands will do that automatically
% at some time but it is in the responsability of the user to
% at some time but it is in the responsibility of the user to
% ensure that when using low-level code.
% If the internal command doesn't exist the box is assumed to be untagged.
% \begin{macrocode}
Expand Down
4 changes: 2 additions & 2 deletions tagpdf-data.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
% \section{The LaTeX namespace}
% This is the main new namespace. It is bound to change a lot!
% It lists the new tag, the rolemap and the namespace of the rolemap.
% latex-lab has also a namespace module, which takes precendence!
% latex-lab has also a namespace module, which takes precedence!
% \begin{macrocode}
%<*ns-latex>
%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-04-12} {0.99b}
Expand Down Expand Up @@ -430,7 +430,7 @@ xor,xor,mathml,
% \section{Rule naming}
% \begin{macro}{\c_@@_role_rules_prop}
% These two properties map the rule strings to numbers and back.
% There are in tagpdf-data.dtx near the csv files for easier maintainance.
% There are in tagpdf-data.dtx near the csv files for easier maintenance.
% \begin{macrocode}
%<*package>
\prop_const_from_keyval:Nn \c_@@_role_rules_prop
Expand Down
4 changes: 2 additions & 2 deletions tagpdf-mc-generic.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -393,12 +393,12 @@
% \end{macro}

% \begin{macro}{\@@_add_missing_mcs_to_stream:Nn}
% This is the main command to add mc to the stream. It is therefor
% This is the main command to add mc to the stream. It is therefore
% guarded by the mc-boolean.
%
% If we aren't in the main stream then processing is a bit more
% complicated because to get at the marks in the box we need to
% artifically split it and then look at the split marks.
% artificially split it and then look at the split marks.
%
% First argument is the box to update and the second is the \enquote{stream}.
% In lua mode the command is a no-op.
Expand Down
2 changes: 1 addition & 1 deletion tagpdf-mc-luacode.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
% \date{Version 0.99b, released 2024-04-12}
% \maketitle
% \begin{implementation}
% The code is splitted into three parts: code shared by all engines,
% The code is split into three parts: code shared by all engines,
% code specific to luamode and code not used by luamode.
%
% \section{Marked content code -- luamode code}
Expand Down
2 changes: 1 addition & 1 deletion tagpdf-mc-shared.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
% \end{function}
% \end{documentation}
% \begin{implementation}
% The code is splitted into three parts: code shared by all engines,
% The code is split into three parts: code shared by all engines,
% code specific to luamode and code not used by luamode.
% \section{Marked content code -- shared}
% \begin{macrocode}
Expand Down
4 changes: 2 additions & 2 deletions tagpdf-roles.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
%</driver>
% \fi
% \title{^^A
% The \pkg{tagpdf-roles} module\\ Tags, roles and namesspace code ^^A
% The \pkg{tagpdf-roles} module\\ Tags, roles and namespace code ^^A
% \\ Part of the tagpdf package
% }
%
Expand Down Expand Up @@ -190,7 +190,7 @@
% \end{variable}
%
% \begin{variable}{\g_@@_role_tags_class_prop}
% With pdf 2.0 we store the class in the NS dependant props.
% With pdf 2.0 we store the class in the NS dependent props.
% With pdf <2.0 we store for now the type(s) of a tag in a common
% prop.
% Tags that are rolemapped should get the type from
Expand Down
4 changes: 2 additions & 2 deletions tagpdf-space.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
% This key is deprecated. Use |debug/show=spaces| instead.
% This key works only with luatex and shows with small red
% bars where spaces have been inserted. This is only for debugging and
% is not completly reliable (and change affect other literals and tagging), so it
% is not completely reliable (and change affect other literals and tagging), so it
% should be used with care.
% \end{function}
% \end{documentation}
Expand All @@ -71,7 +71,7 @@
%</header>
% \end{macrocode}
% \section{Code for interword spaces}
% The code is engine/backend dependant. Basically only pdftex and luatex
% The code is engine/backend dependent. Basically only pdftex and luatex
% support real space chars. Most of the code for luatex which uses attributes
% is in the lua code, here are only the keys.
%
Expand Down
14 changes: 7 additions & 7 deletions tagpdf-struct.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
% This inserts an annotation in the structure. \meta{object reference}
% is there reference to the annotation. \meta{struct parent number}
% should be the same number as had been inserted with \cs{tag_struct_parent_int:}
% as |StructParent| value to the dictionary of the annotion.
% as |StructParent| value to the dictionary of the annotation.
% The command will increase the value of the counter
% used by \cs{tag_struct_parent_int:}.
% \end{function}
Expand Down Expand Up @@ -147,7 +147,7 @@
% needed as you can only use structures already defined), and by the
% |ref| key (which can refer to future structures).
% Internally the label name will start with \texttt{tagpdfstruct-} and it stores
% the two attributs |tagstruct| (the structure number) and |tagstructobj| (the
% the two attributes |tagstruct| (the structure number) and |tagstructobj| (the
% object reference).
% \end{function}
% \begin{function}{parent (struct-key)}
Expand Down Expand Up @@ -323,7 +323,7 @@
% in generic mode it can happen after
% a page break that we have to inject into a structure
% sequence an additional mc after. We will store this additional
% info in a property. The key is the absolut mc num, the value the pdf directory.
% info in a property. The key is the absolute mc num, the value the pdf directory.
% \begin{macrocode}
\@@_prop_new:N \g_@@_struct_cont_mc_prop
% \end{macrocode}
Expand Down Expand Up @@ -419,7 +419,7 @@
T, %title, value in () or <>
Lang, %language
Alt, % value in () or <>
E, % abreviation
E, % abbreviation
ActualText,
AF, %pdf 2.0, array of dict, associated files
NS, %pdf 2.0, dict, namespace
Expand Down Expand Up @@ -902,7 +902,7 @@
% Basically it does what |\pdfdict_use:n| does.
% This is used a lot so should be rather fast.
% \begin{macrocode}
\cs_new_protected:Npn \@@_struct_get_dict_content:nN #1 #2 %#1: stucture num
\cs_new_protected:Npn \@@_struct_get_dict_content:nN #1 #2 %#1: structure num
{
\tl_clear:N #2
\prop_map_inline:cn { g_@@_struct_#1_prop }
Expand Down Expand Up @@ -1270,7 +1270,7 @@
% extension.
% AF/AFref is an array and can be used more than once, so we store it in a tl.
% which is expanded.
% AFinline currently uses the fix extention txt.
% AFinline currently uses the fix extension txt.
% texsource is a special variant which creates a tex-file, it expects a
% tl-var as value (e.g. from math grabbing)
%
Expand Down Expand Up @@ -1962,7 +1962,7 @@
\tl_new:N \l_@@_attr_value_tl
\prop_new:N \g_@@_attr_objref_prop %will contain obj num of used attributes
% \end{macrocode}
% This seq is currently kept for compability with the table code.
% This seq is currently kept for compatibility with the table code.
% \begin{macrocode}
\seq_new:N\g_@@_attr_class_used_seq
% \end{macrocode}
Expand Down
2 changes: 1 addition & 1 deletion tagpdf-tree.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@
{
\tl_clear:N \l_@@_tmpa_tl
% \end{macrocode}
% We process the older sec for compability with the table code.
% We process the older sec for compatibility with the table code.
% TODO: check if still needed
% \begin{macrocode}
\seq_map_inline:Nn \g_@@_attr_class_used_seq
Expand Down
2 changes: 1 addition & 1 deletion tagpdf-user.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@
}
% \end{macrocode}
% \end{macro}
% TEMPORARLY FIX (2023-11-17). Until latex-lab is updated we must adapt a sec command:
% TEMPORARY FIX (2023-11-17). Until latex-lab is updated we must adapt a sec command:
% \begin{macrocode}
\AddToHook{package/latex-lab-testphase-sec/after}
{
Expand Down
4 changes: 2 additions & 2 deletions testfiles-pdftex/disable-delayed-shipout.pdftexmain.tpf
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ stream
EMC
/text /l3pdf1 BDC
BT
/F39 14.3462 Tf 133.768 657.235 Td [(1)]TJ/F40 9.9626 Tf( )Tj/F39 14.3462 Tf 24.21 0 Td [(ab)-31(c)]TJ
/F40 14.3462 Tf 133.768 657.235 Td [(1)]TJ/F41 9.9626 Tf( )Tj/F40 14.3462 Tf 24.21 0 Td [(ab)-31(c)]TJ
ET
EMC
/text /l3pdf2 BDC
Expand Down Expand Up @@ -275,7 +275,7 @@ endobj
18 0 obj
<<
/Properties <</l3pdf1 12 0 R /l3pdf2 16 0 R >>/ExtGState 1 0 R
/Font << /F39 20 0 R /F40 21 0 R /F28 22 0 R >>
/Font << /F40 20 0 R /F41 21 0 R /F28 22 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
Expand Down
6 changes: 3 additions & 3 deletions testfiles-pdftex/openaction-0.pdftexmain.tpf
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,12 @@ ET
EMC
/text <</MCID 0 >> BDC
BT
/F28 9.9626 Tf 121.813 658.164 Td [(some)]TJ/F39 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
/F28 9.9626 Tf 121.813 658.164 Td [(some)]TJ/F40 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
ET
EMC
/text <</MCID 1 >> BDC
BT
/F28 9.9626 Tf 121.813 646.209 Td [(some)]TJ/F39 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
/F28 9.9626 Tf 121.813 646.209 Td [(some)]TJ/F40 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
ET
EMC
/Artifact BMC
Expand Down Expand Up @@ -285,7 +285,7 @@ endobj
18 0 obj
<<
/ExtGState 1 0 R
/Font << /F28 22 0 R /F39 25 0 R >>
/Font << /F28 22 0 R /F40 25 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
Expand Down
6 changes: 3 additions & 3 deletions testfiles-pdftex/openaction-1.pdftexmain.tpf
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,12 @@ ET
EMC
/text <</MCID 0 >> BDC
BT
/F28 9.9626 Tf 121.813 658.164 Td [(some)]TJ/F39 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
/F28 9.9626 Tf 121.813 658.164 Td [(some)]TJ/F40 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
ET
EMC
/text <</MCID 1 >> BDC
BT
/F28 9.9626 Tf 121.813 646.209 Td [(some)]TJ/F39 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
/F28 9.9626 Tf 121.813 646.209 Td [(some)]TJ/F40 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
ET
EMC
/Artifact BMC
Expand Down Expand Up @@ -285,7 +285,7 @@ endobj
18 0 obj
<<
/ExtGState 1 0 R
/Font << /F28 22 0 R /F39 25 0 R >>
/Font << /F28 22 0 R /F40 25 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
Expand Down
6 changes: 3 additions & 3 deletions testfiles-pdftex/openaction-2.pdftexmain.tpf
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,12 @@ ET
EMC
/text <</MCID 0 >> BDC
BT
/F28 9.9626 Tf 121.813 658.164 Td [(some)]TJ/F39 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
/F28 9.9626 Tf 121.813 658.164 Td [(some)]TJ/F40 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
ET
EMC
/text <</MCID 1 >> BDC
BT
/F28 9.9626 Tf 121.813 646.209 Td [(some)]TJ/F39 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
/F28 9.9626 Tf 121.813 646.209 Td [(some)]TJ/F40 9.9626 Tf( )Tj/F28 9.9626 Tf 24.962 0 Td [(text)]TJ
ET
EMC
/Artifact BMC
Expand Down Expand Up @@ -285,7 +285,7 @@ endobj
18 0 obj
<<
/ExtGState 1 0 R
/Font << /F28 22 0 R /F39 25 0 R >>
/Font << /F28 22 0 R /F40 25 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
Expand Down
Loading

0 comments on commit 402d0fc

Please sign in to comment.