summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-03-08 03:01:00 +0000
committerNorbert Preining <norbert@preining.info>2020-03-08 03:01:00 +0000
commita8880a5ee484845d9a526c5ca8d21d31214af22b (patch)
tree6571a4bcbb457a90ddeef77c05fd72b7ebbac86e /macros
parent8012fbf3193a5d1699496b198c3bd448973557bd (diff)
CTAN sync 202003080300
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/acro/README2
-rw-r--r--macros/latex/contrib/acro/acro-manual.pdfbin576935 -> 576765 bytes
-rw-r--r--macros/latex/contrib/acro/acro.history1
-rw-r--r--macros/latex/contrib/acro/acro.sty26
-rw-r--r--macros/latex/contrib/chemformula/README2
-rw-r--r--macros/latex/contrib/chemformula/chemformula-manual.cls5
-rw-r--r--macros/latex/contrib/chemformula/chemformula-manual.pdfbin857474 -> 859314 bytes
-rw-r--r--macros/latex/contrib/chemformula/chemformula.sty247
-rw-r--r--macros/latex/contrib/pdfpc/pdfpc.dtx4
-rw-r--r--macros/latex/contrib/pdfpc/pdfpc.pdfbin0 -> 170447 bytes
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40794 -> 40808 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf (renamed from macros/latex/contrib/reledmac/examples/1-criticalendotes.pdf)bin177475 -> 177475 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex (renamed from macros/latex/contrib/reledmac/examples/1-criticalendotes.tex)0
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin121597 -> 121597 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin145283 -> 145283 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin189798 -> 189798 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin123178 -> 123178 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin123463 -> 123463 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin122256 -> 122256 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin126045 -> 126045 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin18108 -> 18103 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin187631 -> 187631 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin124324 -> 124324 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin144492 -> 144492 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin138405 -> 138405 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin158108 -> 158108 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin129005 -> 129005 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin140523 -> 140523 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin135414 -> 135414 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31649 -> 31578 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin215012 -> 215012 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin190222 -> 190222 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin175170 -> 175170 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin24279 -> 24281 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin93475 -> 93475 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin37802 -> 37805 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin138222 -> 138222 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin190161 -> 190161 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin189362 -> 189362 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin168099 -> 168099 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin189915 -> 189915 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin188836 -> 188836 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin188745 -> 188745 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin188865 -> 188865 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin189690 -> 189690 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin134815 -> 134815 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin190134 -> 190134 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin201833 -> 201833 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin123601 -> 123601 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin215182 -> 215182 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin239560 -> 239560 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin125082 -> 125082 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin123151 -> 123151 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin263410 -> 263410 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin183782 -> 183782 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin118947 -> 118947 bytes
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin356258 -> 356254 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx105
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin1982446 -> 1982228 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.dtx89
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin985304 -> 987328 bytes
-rw-r--r--macros/xetex/latex/parsa/IntLogo.pngbin7519 -> 0 bytes
-rw-r--r--macros/xetex/latex/parsa/IranLogo.pngbin9041 -> 0 bytes
-rw-r--r--macros/xetex/latex/parsa/README.md (renamed from macros/xetex/latex/parsa/README.txt)14
-rw-r--r--macros/xetex/latex/parsa/minimaltemplate.pdfbin139000 -> 0 bytes
-rw-r--r--macros/xetex/latex/parsa/minimaltemplate.tex230
-rw-r--r--macros/xetex/latex/parsa/parsa-doc.pdfbin221431 -> 124813 bytes
-rw-r--r--macros/xetex/latex/parsa/parsa-doc.tex577
-rw-r--r--macros/xetex/latex/parsa/parsa.sty85
-rw-r--r--macros/xetex/latex/parsa/picture.jpgbin38645 -> 0 bytes
70 files changed, 679 insertions, 708 deletions
diff --git a/macros/latex/contrib/acro/README b/macros/latex/contrib/acro/README
index 221ded70e3..9dbf34791f 100644
--- a/macros/latex/contrib/acro/README
+++ b/macros/latex/contrib/acro/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the ACRO package v2.11c 2020/02/03
+the ACRO package v2.11d 2020/03/07
Typeset Acronyms
diff --git a/macros/latex/contrib/acro/acro-manual.pdf b/macros/latex/contrib/acro/acro-manual.pdf
index 4fea1ccc17..a352ce8772 100644
--- a/macros/latex/contrib/acro/acro-manual.pdf
+++ b/macros/latex/contrib/acro/acro-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/acro/acro.history b/macros/latex/contrib/acro/acro.history
index d719448f3e..fa6f336991 100644
--- a/macros/latex/contrib/acro/acro.history
+++ b/macros/latex/contrib/acro/acro.history
@@ -283,3 +283,4 @@ feel free to contact me.
2020/01/16 v2.11a - adapt to new l3text module
2020/01/24 v2.11b - fix issue #147
2020/02/03 v2.11c - fix issue #76
+2020/03/07 v2.11c - fix issues #149 and #150
diff --git a/macros/latex/contrib/acro/acro.sty b/macros/latex/contrib/acro/acro.sty
index 7346367aff..5209dda3ca 100644
--- a/macros/latex/contrib/acro/acro.sty
+++ b/macros/latex/contrib/acro/acro.sty
@@ -35,10 +35,10 @@
\ExplSyntaxOn
-\tl_const:Nn \c_acro_date_tl {2020/02/03}
+\tl_const:Nn \c_acro_date_tl {2020/03/07}
\tl_const:Nn \c_acro_version_major_number_tl {2}
\tl_const:Nn \c_acro_version_minor_number_tl {11}
-\tl_const:Nn \c_acro_version_subrelease_tl {c}
+\tl_const:Nn \c_acro_version_subrelease_tl {d}
\tl_const:Nx \c_acro_version_number_tl
{
\c_acro_version_major_number_tl .
@@ -174,6 +174,7 @@
\bool_new:N \l__acro_custom_alt_format_bool
\bool_new:N \l__acro_custom_long_format_bool
\bool_new:N \l__acro_custom_short_format_bool
+\bool_new:N \l__acro_custom_foreign_format_bool
\bool_new:N \l__acro_extra_punct_bool
\bool_new:N \l__acro_extra_use_brackets_bool
\bool_new:N \g__acro_first_acronym_declared_bool
@@ -529,8 +530,8 @@
\tl_set_eq:NN \l__acro_alt_format_tl \l__acro_short_format_tl
\tl_set:Nn \l__acro_list_short_format_tl {#1} ,
short-format .value_required:n = true ,
- alt-format .code:n =
- \tl_set:Nn \l__acro_alt_format_tl {#1} ,
+ alt-format .tl_set:N = \l__acro_alt_format_tl ,
+ alt-format .value_required:n = true ,
long-format .code:n =
\tl_set:Nn \l__acro_long_format_tl {#1}
\tl_set:Nn \l__acro_first_long_format_tl {#1}
@@ -2074,6 +2075,12 @@
\bool_set_true:N \l__acro_custom_alt_format_bool
}
{ \bool_set_false:N \l__acro_custom_alt_format_bool }
+ \acro_property_get:nnTF {#1} {foreign-format}
+ {
+ \tl_set_eq:NN \l__acro_custom_foreign_format_tl \l__acro_foreign_format_tl
+ \bool_set_true:N \l__acro_custom_foreign_format_bool
+ }
+ { \bool_set_false:N \l__acro_custom_foreign_format_bool }
\acro_property_get:nn {#1} {single-format}
\acro_for_endings_do:n
{
@@ -2110,7 +2117,7 @@
% input
% #1: ending
% #2: id
-% #3: short|alt|long
+% #3: short|alt|long|foreign
\cs_new_protected:Npn \__acro_set_ending_for:nnn #1#2#3
{
\acro_if_ending_form_exist:nnT {#1} {#3}
@@ -2199,6 +2206,12 @@
{ \l__acro_custom_alt_format_tl }
{ \l__acro_alt_format_tl }
}
+ {foreign}
+ {
+ \bool_if:NTF \l__acro_custom_foreign_format_bool
+ { \l__acro_custom_foreign_format_tl }
+ { \l__acro_foreign_format_tl }
+ }
}
}
{ \use:n }
@@ -2652,6 +2665,7 @@
\acro_property_get:nnT {#1} {foreign}
{
\group_begin:
+ \__acro_endings:nn {#1} {foreign}
\tl_use:N \l__acro_foreign_format_tl
{
\acro_foreign_language:VV
@@ -2663,7 +2677,7 @@
}
}
-\cs_new:Npn \acroenparen #1 { ( #1 ) }
+\cs_new:Npn \acroenparen #1 { (#1) }
\cs_new_protected:Npn \acro_get_foreign:n #1
{
diff --git a/macros/latex/contrib/chemformula/README b/macros/latex/contrib/chemformula/README
index 5de7b5d18b..d539688182 100644
--- a/macros/latex/contrib/chemformula/README
+++ b/macros/latex/contrib/chemformula/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the CHEMFORMULA package v4.15i 2020/02/01
+the CHEMFORMULA package v4.15j 2020/03/07
typeset chemical compounds and reactions
diff --git a/macros/latex/contrib/chemformula/chemformula-manual.cls b/macros/latex/contrib/chemformula/chemformula-manual.cls
index e57fd96154..1935e5d8b3 100644
--- a/macros/latex/contrib/chemformula/chemformula-manual.cls
+++ b/macros/latex/contrib/chemformula/chemformula-manual.cls
@@ -153,17 +153,16 @@
\begingroup
\catcode`\^^M=13
\gdef\chemformula@read@options#1#2^^M{%
- \endgroup
\ifblank{#2}{}{\chemformula@read@options@#2}%
#1%
\XSIMfilewritestart*{\jobname.tmp}%
}%
\endgroup
+
\def\chemformula@read@options@[#1]{\pgfqkeys{/cnltx}{#1}}
\RenewDocumentEnvironment{sourcecode}{}
{%
- \begingroup
\chemformula@readoptions{%
\setlength\cnltx@sidebysidewidth
{\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
@@ -187,7 +186,6 @@
\RenewDocumentEnvironment{example}{}
{%
- \begingroup
\chemformula@readoptions{%
\setlength\cnltx@sidebysidewidth
{\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
@@ -204,6 +202,7 @@
}
{%
\XSIMfilewritestop
+ \catcode`\^^M=5
\ifbool{cnltx@sidebyside}
{%
\cnltxcode
diff --git a/macros/latex/contrib/chemformula/chemformula-manual.pdf b/macros/latex/contrib/chemformula/chemformula-manual.pdf
index ab030bac8a..6e3c49e1af 100644
--- a/macros/latex/contrib/chemformula/chemformula-manual.pdf
+++ b/macros/latex/contrib/chemformula/chemformula-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/chemformula/chemformula.sty b/macros/latex/contrib/chemformula/chemformula.sty
index f54109bf59..1f926e1243 100644
--- a/macros/latex/contrib/chemformula/chemformula.sty
+++ b/macros/latex/contrib/chemformula/chemformula.sty
@@ -30,9 +30,9 @@
\usetikzlibrary{arrows.meta}
\ExplSyntaxOn
-\tl_const:Nn \c_chemformula_date_tl {2020/02/01}
+\tl_const:Nn \c_chemformula_date_tl {2020/03/07}
\tl_const:Nn \c_chemformula_version_number_tl {4.15}
-\tl_const:Nn \c_chemformula_version_suffix_tl {i}
+\tl_const:Nn \c_chemformula_version_suffix_tl {j}
\tl_const:Nx \c_chemformula_version_tl
{ \c_chemformula_version_number_tl \c_chemformula_version_suffix_tl }
\tl_const:Nn \c_chemformula_info_tl
@@ -366,6 +366,61 @@
\box_new:N \l__chemformula_subscript_box
% --------------------------------------------------------------------------
+% catcode stuff
+\cs_new_protected:Npn \__chemformula_save_catcodes:
+ {
+ \cs_gset_protected:Npx \__chemformula_restore:
+ {
+ \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } }% _
+ \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } }% :
+ \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }% ^
+ \char_set_catcode:nn { 123 } { \char_value_catcode:n { 123 } }% {
+ \char_set_catcode:nn { 125 } { \char_value_catcode:n { 125 } }% }
+ \char_set_catcode:nn { 35 } { \char_value_catcode:n { 35 } }% #
+ \char_set_catcode:nn { 33 } { \char_value_catcode:n { 33 } }% !
+ \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } }% "
+ \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } }% <
+ \char_set_catcode:nn { 62 } { \char_value_catcode:n { 62 } }% >
+ \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } }% ~
+ }
+ }
+
+\cs_gset_protected:Npn \__chemformula_basic_catcodes:
+ {
+ % expl3 catcodes:
+ \char_set_catcode_letter:N \_
+ \char_set_catcode_letter:N \:
+ % I've forgotten why I put this here:
+ \char_set_catcode_math_superscript:N \^
+ % disable some of the specials (needed for sub- and superscripts):
+ \char_set_catcode_letter:N \#
+ % make the naming work with babel languages like French that make
+ % ! active:
+ \char_set_catcode_other:N \!
+ % make the naming work with babel languages like Spanish that make
+ % < and > active:
+ \char_set_catcode_other:N \>
+ \char_set_catcode_other:N \<
+ % ensure " is other:
+ \char_set_catcode_other:N \"
+ % spaces are spaces:
+ \char_set_catcode_space:N \
+ }
+
+\cs_new_protected:Npn \__chemformula_sanitize:Nn #1#2
+ {
+ \tl_set_rescan:Nnn #1
+ {
+ \__chemformula_basic_catcodes:
+ % disable some of the specials (needed for sub- and superscripts):
+ \char_set_catcode_letter:N \{
+ \char_set_catcode_letter:N \}
+ }
+ {#2}
+ }
+\cs_generate_variant:Nn \__chemformula_sanitize:Nn {NV}
+
+% --------------------------------------------------------------------------
% general and helper functions:
\cs_new_protected:Npn \chemformula_tikz:nn #1#2
{
@@ -829,9 +884,10 @@
\cs_new_protected:Npn \__chemformula_arrow_draw:nnn #1#2#3
{
\chemformula_nobreak:
+ % \__chemformula_sanitize:Nn \l__chemformula_tmpc_tl {#1}
% prepare arrow code for drawing:
\tl_set_rescan:Nnn \l__chemformula_tmpc_tl
- { \char_set_catcode_letter:N \_ } {#1}
+ { \__chemformula_basic_catcodes: } {#1}
% determine length of the arrow
\hbox_set:Nn \l__chemformula_arrow_arg_i_box
{ \tl_use:N \l__chemformula_arrow_label_style_tl #2 }
@@ -880,10 +936,27 @@
\prg_new_conditional:Npnn \chemformula_if_is_arrow:n #1 {p,T,F,TF}
{
- \seq_if_in:NnTF \l__chemformula_arrows_type_seq {#1}
+ \__chemformula_sanitize:Nn \l__chemformula_tmpa_tl {#1}
+ \seq_if_in:NVTF \l__chemformula_arrows_type_seq \l__chemformula_tmpa_tl
{ \prg_return_true: }
{ \prg_return_false: }
}
+\prg_generate_conditional_variant:Nnn \chemformula_if_is_arrow:n {V} {T,F,TF}
+
+\cs_new_protected:Npn \chemformula_define_arrow:nn #1#2
+ {
+ \__chemformula_sanitize:Nn \l__chemformula_tmpa_tl {#1}
+ \__chemformula_sanitize:Nn \l__chemformula_tmpb_tl {#2}
+ \seq_if_in:NVF \l__chemformula_arrows_type_seq \l__chemformula_tmpa_tl
+ {
+ \seq_put_right:NV
+ \l__chemformula_arrows_type_seq
+ \l__chemformula_tmpa_tl
+ }
+ \prop_put:NVV \l__chemformula_arrows_code_prop
+ \l__chemformula_tmpa_tl
+ \l__chemformula_tmpb_tl
+ }
% commands to declare arrows (can also be used by users):
% #1: symbol, #2: code
@@ -891,36 +964,23 @@
{
\chemformula_if_is_arrow:nTF {#1}
{ \msg_error:nnn {chemformula} {new-arrow} {#1} }
- {
- % store type in the sequence and code in the property list
- \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1}
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
}
\NewDocumentCommand \DeclareChemArrow {mm}
- {
- \chemformula_if_is_arrow:nF {#1}
- { \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1} }
- % store type in the sequence and code in the property list
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
\NewDocumentCommand \RenewChemArrow {mm}
{
\chemformula_if_is_arrow:nTF {#1}
- { \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2} }
+ { \chemformula_define_arrow:nn {#1} {#2} }
{ \msg_error:nnn {chemformula} {renew-arrow} {#1} }
}
\NewDocumentCommand \ProvideChemArrow {mm}
{
\chemformula_if_is_arrow:nF {#1}
- {
- % store type in the sequence and code in the property list
- \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1}
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
}
\NewDocumentCommand \ShowChemArrow {m}
@@ -1021,7 +1081,7 @@
\draw[chemarrow] (cf_arrow_mid) ++ (.6ex,.4ex) -- ++(-.4ex,-.8ex) ;
}
% net reaction:
-\NewChemArrow {==} { \node at ([yshift=-.2ex]cf_arrow_mid) { = } ; }
+\NewChemArrow {==} { \node at ([yshift=-.2ex]cf_arrow_mid) {=} ; }
% quasi equilibria:
\NewChemArrow{<=o>}{
\draw[chemarrow,-left~cf]
@@ -1072,7 +1132,6 @@
\tl_set:Nn \l__chemmacros_tmpa_tl {#1}
\tl_trim_spaces:N \l__chemmacros_tmpa_tl
\seq_set_split:NnV \l__chemformula_input_seq {~} \l__chemmacros_tmpa_tl
- % \seq_show:N \l__chemformula_input_seq
% remove empty items in order to avoid unnecessary processing:
\seq_remove_all:Nn \l__chemformula_input_seq {}
% disable \xspace:
@@ -1087,11 +1146,9 @@
\seq_map_function:NN
\l__chemformula_input_seq
\__chemformula_input:n
- % \tl_analysis_show:N \l__chemformula_input_tl
\__chemformula_prepare_output:NV
\l__chemformula_input_tl
\l__chemformula_catcodes_tl
- % \tl_analysis_show:N \l__chemformula_input_tl
\chemformula_write:V \l__chemformula_input_tl
}
\group_end:
@@ -1116,7 +1173,6 @@
\__chemformula_ch_newline:w #2 \\ \q_no_value \q_stop
\group_align_safe_end:
\tl_use:N \g__chemformula_output_tl
-% \tl_show:N \g__chemformula_output_tl
\tl_gclear:N \g__chemformula_output_tl
}
\cs_generate_variant:Nn \chemformula_ch:nn {V,nV,VV}
@@ -1286,8 +1342,6 @@
\cs_new_protected:Npn \chemformula_chwritebelow:nn #1#2
{
- % \tl_set:Nn \l_tmpa_tl {#1} \show \l_tmpa_tl
- % \tl_set:Nn \l_tmpa_tl {#2} \show \l_tmpa_tl
\c_math_toggle_token
\underset
{
@@ -1715,8 +1769,6 @@
}
\cs_generate_variant:Nn \__chemformula_subscript:n {V}
-% TODO: add hook for cleanup?
-% similar to ChemCompoundProperty?
\prop_new:N \l__chemformula_clean_subscript_prop
\seq_new:N \l__chemformula_clean_subscript_seq
@@ -1838,75 +1890,9 @@
}
\cs_generate_variant:Nn \__chemformula_superscript:n {V}
-% TODO: add hook for cleanup?
-% \prop_new:N \l__chemformula_clean_superscript_prop
-% \seq_new:N \l__chemformula_clean_superscript_seq
-
-% \cs_new_protected:Npn \chemformula_add_superscript_cleanup:nnn #1#2#3
-% {
-% \seq_put_right:Nn \l__chemformula_clean_superscript_seq {#1}
-% \prop_put:Nnn \l__chemformula_clean_superscript_prop {#1}
-% { \bool_if:NTF \l__chemformula_kroegervink_bool {#2} {#3} }
-% }
-
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_single_bond: }
-% { \chemformula_minus: }
-% { \chemformula_minus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { - }
-% { \chemformula_minus: }
-% { \chemformula_minus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_triple_bond: }
-% { \chemformula_plus: }
-% { \chemformula_plus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { + }
-% { \chemformula_plus: }
-% { \chemformula_plus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { . }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_adduct: }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_star_adduct: }
-% { * }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { * }
-% { * }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { ' }
-% { ' }
-% { \chemformula_kroegervink_negative: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_prime: }
-% { \chemformula_prime: }
-% { \chemformula_kroegervink_negative: }
-% \chemformula_add_superscript_cleanup:nnn
-% { , }
-% { \chemformula_decimal: }
-% { , }
-
% rename this function into treatment instead of cleanup
\cs_new_protected:Npn \__chemformula_clean_superscript:
{
- % \seq_map_inline:Nn \l__chemformula_clean_superscript_seq
- % {
- % \tl_replace_all:Nnx \l__chemformula_superscript_tl
- % {##1}
- % { \prop_item:Nn \l__chemformula_clean_superscript_prop {##1} }
- % }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
{ \chemformula_single_bond: } { \chemformula_minus: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
@@ -2294,7 +2280,6 @@
% input compounds
\cs_new_protected:Npn \__chemformula_input_compound:Nn #1#2
{
- % \tl_show:n {#1}
\tl_if_blank:VTF \l__chemformula_stoich_tl
{
% TODO
@@ -2397,53 +2382,6 @@
\cs_new_protected:Npn \__chemformula_fontspec_aux:w [#1]#2 \q_stop
{ \newfontfamily \chemformula_font: [#1] {#2} }
-\cs_new_protected:Npn \__chemformula_save_catcodes:
- {
- \cs_gset_protected:Npx \__chemformula_restore:
- {
- \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } }% _
- \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } }% :
- \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }% ^
- \char_set_catcode:nn { 123 } { \char_value_catcode:n { 123 } }% {
- \char_set_catcode:nn { 125 } { \char_value_catcode:n { 125 } }% }
- \char_set_catcode:nn { 35 } { \char_value_catcode:n { 35 } }% #
- \char_set_catcode:nn { 33 } { \char_value_catcode:n { 33 } }% !
- \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } }% "
- \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } }% <
- \char_set_catcode:nn { 62 } { \char_value_catcode:n { 62 } }% >
- \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } }% ~
- }
- }
-
-\cs_new_protected:Npn \__chemformula_sanitize:Nn #1#2
- {
- \tl_set_rescan:Nnn #1
- {
- % expl3 catcodes:
- \char_set_catcode_letter:N \_
- \char_set_catcode_letter:N \:
- % I've forgotten why I put this here:
- \char_set_catcode_math_superscript:N \^
- % disable some of the specials (needed for sub- and superscripts):
- \char_set_catcode_letter:N \{
- \char_set_catcode_letter:N \}
- % this one seems not necessary any more:
- % \char_set_catcode_letter:N \\
- \char_set_catcode_letter:N \#
- % make the naming work with babel languages like French that make
- % ! active:
- \char_set_catcode_other:N \!
- % make the naming work with babel languages like Spanish that make
- % < and > active:
- \char_set_catcode_other:N \>
- \char_set_catcode_other:N \<
- % ensure " is other:
- \char_set_catcode_other:N \"
- }
- {#2}
- }
-\cs_generate_variant:Nn \__chemformula_sanitize:Nn {NV}
-
\cs_new_protected:Npn \__chemformula_prepare_output:Nn #1#2
{
\tl_set_rescan:NnV #1
@@ -2869,8 +2807,9 @@
{
\tl_set_rescan:Nnn \l__chemformula_tmpa_tl
{
- \char_set_catcode_letter:N \_
- \char_set_catcode_other:N \:
+ % \char_set_catcode_letter:N \_
+ % \char_set_catcode_other:N \:
+ \char_set_catcode_space:N \~
}
{#1}
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
@@ -2879,15 +2818,6 @@
{_} { \sb }
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
{ chemformulaplaceholder } { \_ }
- % those cause trouble with chemmacros' \ox:
- % \tl_put_left:Nn \l__chemformula_tmpa_tl
- % { \chemformula_group_begin: }
- % \tl_put_right:Nn \l__chemformula_tmpa_tl
- % { \chemformula_group_end: }
- % \tl_set_rescan:NnV \l__chemformula_tmpa_tl
- % { \__chemformula_restore: \char_set_catcode_other:N \~ }
- % \l__chemformula_tmpa_tl
- % \__chemformula_reset:NV \l__chemformula_tmpa_tl \l__chemformula_tmpa_tl
\tl_put_right:NV \l__chemformula_input_tl \l__chemformula_tmpa_tl
}
@@ -2946,7 +2876,6 @@
{_} { \sb }
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
{ chemformulaplaceholder } { \_ }
- % \__chemformula_reset:NV \l__chemformula_tmpa_tl \l__chemformula_tmpa_tl
\tl_put_left:Nn \l__chemformula_tmpa_tl
{ \chemformula_group_begin: }
\tl_put_right:Nn \l__chemformula_tmpa_tl
@@ -3083,7 +3012,7 @@
\bool_set_false:N \l__chemformula_fontspec_bool
\tl_set:Nn \l__chemformula_format_tl {#1} ,
atom-format .tl_set:N = \l__chemformula_atom_format_tl ,
- set-catcodes .tl_set:N = \l__chemformula_catcodes_tl
+ set-catcodes .tl_set:N = \l__chemformula_catcodes_tl
}
% --------------------------------------------------------------------------
@@ -3574,12 +3503,14 @@ VERSION HISTORY
- implement \shortintertext bypass
2019/09/23 - version 4.15f - add missing definition for temporary variable
2019/09/27 - version 4.15g - bug fix in fontspec option
-2019/10/13 - version 4.15h - new (undocumented) option set-catcodes
+2019/10/13 - version 4.15h - new (undocumented) option `set-catcodes'
- fix behaviour with category codes
(https://tex.stackexchange.com/q/511592/)
- fix bug: local format changes are now applied
again
2020/02/01 - version 4.15i - fix issue #12
+2020/03/07 - version 4.15j - make sure that < and > have catcode 12 when read
+ as arrows -- again...
% --------------------------------------------------------------------------
% IDEAS:
diff --git a/macros/latex/contrib/pdfpc/pdfpc.dtx b/macros/latex/contrib/pdfpc/pdfpc.dtx
index 4177554186..ad5430f324 100644
--- a/macros/latex/contrib/pdfpc/pdfpc.dtx
+++ b/macros/latex/contrib/pdfpc/pdfpc.dtx
@@ -55,7 +55,7 @@
%
% Identify the package and force \LaTeXe:
% \begin{macrocode}
-\ProvidesPackage{pdfpc}[2019/12/03 v0.2 PDFPC]
+\ProvidesPackage{pdfpc}[2019/12/03 v0.2.1 PDFPC]
\NeedsTeXFormat{LaTeX2e}
% \end{macrocode}
%
@@ -89,14 +89,12 @@
{\PackageWarningNoLine{pdfpc}{`duration' should be an integer}}%
\fi
%
-\ifx\PDFPC@duration\@empty
\ifx\PDFPC@enduserslide\@empty
\else
\IfInteger{\PDFPC@enduserslide}{}
{\PackageWarningNoLine{pdfpc}{`enduserslide' should be an integer}}%
\fi
%
-\ifx\PDFPC@duration\@empty
\ifx\PDFPC@lastminutes\@empty
\else
\IfInteger{\PDFPC@lastminutes}{}
diff --git a/macros/latex/contrib/pdfpc/pdfpc.pdf b/macros/latex/contrib/pdfpc/pdfpc.pdf
new file mode 100644
index 0000000000..275a168ac1
--- /dev/null
+++ b/macros/latex/contrib/pdfpc/pdfpc.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
index 77b921de15..8d9a06b286 100644
--- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index 19d0762f4d..569aa77469 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendotes.tex b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
index 453b1ce5e4..453b1ce5e4 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendotes.tex
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.tex
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index a4811cf3e9..c7be79abaf 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
index de8bcfccc9..3c9593e657 100644
--- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
index f71e0c840d..2a9d0dac7a 100644
--- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
index 2d2a61ecb4..469ee797c0 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf
index 7e45349188..c17e0c41f9 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index 26085b2246..6886bf80ff 100644
--- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
index 37724a0477..22bf961c99 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index adae49930f..d7a8c20469 100644
--- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
index ec7e2ece1a..ecc70e013f 100644
--- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
index 13ff8a36cd..958c9fa978 100644
--- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
index 69b8e3ff6d..d2aff82445 100644
--- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
index fe82c6f1b4..4aa9567e30 100644
--- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
index 665a7c04af..15095aba74 100644
--- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
index e38c08326c..ff1a00d2ac 100644
--- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
index b4766f6b5f..ee7f120c90 100644
--- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf
index 5966417770..f73205792e 100644
--- a/macros/latex/contrib/reledmac/examples/2-performances.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
index 65fc70c7d9..97d2f7f851 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
index 84ca39a203..838b2a3409 100644
--- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index 20af46f3ad..8699fc6293 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
index 16dfbd79c4..47816b8c0d 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
index 3e404a80e2..208c6fcb01 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
index 8cf7b2e56e..2e0f36b80b 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index ec75344f04..5dee9bad9c 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index e8a2841f21..5d5f5dbc52 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index 8cad26ed49..15217b2e57 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index 5d5fff895c..d74ac16fa4 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
index d90724dda1..8d734eb247 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index c82a62cde3..8f3aed07f8 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index b01479e9a9..91a3e6bd91 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index 1d0e5da940..8cb89f7bd5 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index 3dbfa513d9..2c69289ec2 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index af994fccee..188b182e8c 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index f0eb2e184d..bc2dd25e64 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
index bc33f2c41a..d1579129da 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index a8ec60d177..6ec18019d0 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 4043c44adc..dfa0ce2ea4 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index 040f1d384d..b58cd2c2a1 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
index 28d4e10483..970c4cd22c 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index 3107cf1c01..17510a9312 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index 9ccd07ce64..9280fcf71e 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index 0fcd37b00f..9730bd9485 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index 15a296f84f..d2b1e2540e 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
index 824adbbfd5..e64716dd29 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index a1860bc1c5..395c1fe719 100644
--- a/macros/latex/contrib/reledmac/migration.pdf
+++ b/macros/latex/contrib/reledmac/migration.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx
index 41a7e62244..2634484f6a 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -295,7 +295,7 @@
% \changes{v1.23.0}{2015/05/18}{Compatibility between nofamiliar/nocriticals option and minipage/ledgroup.}
% \changes{v1.23.0}{2015/05/18}{Fix error of \protect\cs{iftrue} not closed.}
% \changes{v1.23.0}{2015/05/18}{Allow use of \protect\cs{sameword} with inputenc managing of UTF-8.}
-% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
+% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ldots\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
% \changes{v1.23.0}{2015/05/18}{New tools to ensure the line-list file uses the right version of commands when upgrading the eledmac version.}
% \changes{v1.23.0}{2015/05/18}{Fix a bug with \protect\cs{skipnumbering} called immediately after a \protect\cs{pstart}.}
% \changes{v1.23.0}{2015/05/18}{Fix spurious space with \protect\cs{skipnumbering} (bug added on v1.21.0).}
@@ -382,7 +382,7 @@
% \changes{v2.7.2}{2015/12/13}{Fix problem of hyphenation when using \protect\package{hyperref} package (added in v2.7.0).}
% \changes{v2.8.0}{2016/01/15}{\protect\macpackage cross-referencing can take advantage of \protect\package{xr} package.}
% \changes{v2.8.0}{2016/01/15}{No indentation for paragraphed notes in ledgroup. Can be changed with \protect\cs{Xparindent} and \protect\cs{parindentX}.}
-% \changes{v2.8.0}{2016/01/15}{More \protect\cs{edgls...} commands.}
+% \changes{v2.8.0}{2016/01/15}{More \protect\cs{edgls\ldots} commands.}
% \changes{v2.8.1}{2016/02/22}{Warnings for undefined labels are really parsable by latexmk}
% \changes{v2.8.2}{2016/02/27}{Fix a bug with \protect\cs{AtEveryPstart} added in version 2.0.0.}
% \changes{v2.8.2}{2016/02/27}{Fix a bug with vertical space after the between-sectioning command as optional argument of a \protect\cs{pstart} and \protect\cs{pstart} content}
@@ -449,8 +449,8 @@
% \changes{v2.16.5}{2016/10/20}{Fix potential spurious spaces in endnotes.}
% \changes{v2.16.6}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
% \changes{v2.16.6}{2016/11/14}{Fix a bug with the line number style in \protect\cs{doennotes} when referring to right side line in parallel typesetting.}
-% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
-% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}\ldots\ \protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ldots\ \protect\cs{endnumbering}.}
% \changes{v2.16.8}{2016/12/16}{Fix a bug with \protect\cs{edindex} in footnotes in parallel typesetting.}
% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.}
% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.}
@@ -540,9 +540,12 @@
% \changes{v2.32.2}{2019/11/28}{Fix spurious vertical space in familiar footnotes with \protect\LuaLaTeX.}
% \changes{v2.32.3}{2019/12/09}{Fix bug with critical footnotes when typesetting arabic text with \protect\package{polyglossia}.}
% \changes{v2.32.4}{2020/02/04}{Fix bug \protect\cs{footnoteXmark} and \protect\cs{footnoteXtext}.}
-% \changes{v2.32.4}{2020/01/04}{\protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} can now have an optional argument, setting the footnotenote number.}
+% \changes{v2.32.4}{2020/01/04}{\protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} can now have an optional argument, setting the footnote number.}
% \changes{v2.32.4}{2020/02/04}{Fix bug when using \protect\cs{Xgroupbyline} and twocol arrangement.}
% \changes{v2.32.4}{2020/02/04}{Fix bug with three and two columns footnotes when using \protect\package{bidi}.}
+% \changes{v2.32.5}{2020/03/08}{Fix bug with \protect\cs{edindex} inside \protect\cs{eledsection} and related.}
+% \changes{v2.32.5}{2020/03/08}{Fix bug with page number in index with \protect\cs{edindex} when indexing a critical notes.}
+% \changes{v2.32.5}{2020/03/08}{Fix bug with macro inside \protect\cs{sameword} with no-\protect\XeTeX\ engines.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -801,6 +804,7 @@
%
%Please read \reff{Xmaxhnotes}.
%
+% If you use \LuaTeX\ engine, you need \LuaTeX\ 1.1.0 or later.
% A file may mix \emph{numbered} and \emph{unnumbered} text.
%
% Numbered text is printed with marginal line numbers and can include
@@ -1395,7 +1399,7 @@
% If you want to change the separator, you can use \\
% \cs{setlinenumannotationsep}\marg{sep}
% \subsubsection{Annotations in the apparatus}
-% Some others options for the annotation in the apparatus are described on \reff{annotation-inapparatus}
+% Some other options for the annotation in the apparatus are described on \reff{annotation-inapparatus}
% \subsection{Executing code at each line}\label{linehook}
% \Macpackage provides an advanced feature for users.
% \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook}
@@ -1779,6 +1783,10 @@
%
% With these tools, \XeTeX\ / \LuaTeX\ will dynamicaly normalize unicode input when reading the file.
% Consequently, you will have no problems with the \protect\cs{sameword} command.
+% \subsubsection{Notes about right-to-left texts}
+% Due to some internal limits of \XeTeX, \cs{sameword} does not work with right-to-left text with this engine.
+%
+% If you need to use \cs{sameword} with right-to-left text, you must use \LuaTeX.
% \subsubsection{Use with \protect\cs{lemma} command}
% If you use the \protect\cs{lemma} command, \macpackage\ cannot know to which occurence of \cs{sameword} in the first argument of \cs{edtext} a word marked with \cs{sameword} in \cs{lemma} should refer.
%
@@ -2267,7 +2275,7 @@
% \subsubsection{Print line number only at first time}
% \DescribeMacro{\Xnumberonlyfirstinline}\label{Xnumberonlyfirstinline}
% \changes{v1.0.1}{2012/09/16}{Correction on \protect\cs{Xnumberonlyfirstinline} with lineation by pstart or by page.}
-% By default, the line number is printed in every note. If you want to print it only the first time for a given line number
+% By default, the line number is printed inside every note. If you want to print it only the first time for a given line number
% (i.e., once for line 1, once for line 2, etc.), you can use \protect\cs{Xnumberonlyfirstinline}\oarg{s}.
%
%
@@ -2289,18 +2297,18 @@
%
% \subsubsection{Print line number annotation only at first time}\label{annotation-inapparatus}
% \DescribeMacro{\Xlinenumannotationonlyfirst}
-% By default, the line number annotation (\reff{annotion} is printed in every note. If you want to print it only the first time for a given annotation
+% By default, the line number annotation (\reff{annotion} is printed inside every note. If you want to print it only the first time for a given annotation
% you can use \cs{Xlinenumannotationonlyfirst}\oarg{s}.
%
-% Note the two followings points:
+% Note the two following points:
% \begin{itemize}
% \item If you use \option{noresetlinenumannotation} option of \macpackage, the \cs{Xlinenumannotationonlyfirst} won't take account of the official line number.
-% \item The \cs{Xlinenumannotationonlyfirst} works for consecutive lemma with the same annotation. That is, if you have for example a lemma with \verb+A+ annotation, then a lemma with \verb+B+ annotation, then a lemma with \verb+A+ annotation, all lemma will have its annotation in the apparatus.
+% \item The \cs{Xlinenumannotationonlyfirst} works for consecutive lemmas with the same annotation. That is, if you have for example a lemma with \verb+A+ annotation, then a lemma with \verb+B+ annotation, then a lemma with \verb+A+ annotation, all lemmas will have its own annotation in the apparatus.
% \end{itemize}
%
% \DescribeMacro{\Xlinenumannotationonlyfirstintwo}
-% Suppose you have a lemma on annoation~1 and a lemma between annotation~1 and annotation~3.
-% With \cs{Xlinenumannotationonlyfirst}, the second lemma is considered to be with the same line annotation as the first lemma.
+% Suppose you have a lemma on annotation~1 and a lemma between annotation~1 and annotation~3.
+% With \cs{Xlinenumannotationonlyfirst}, the second lemma is considered to have the same annotation as the first lemma.
% But if you use both \cs{Xlinenumannotationonlyfirst}\oarg{s} and \cs{Xlinenumannotationonlyfirstintwo}\oarg{s}, a distinction is made.
%
%
@@ -4321,7 +4329,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/02/04 v2.32.4 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/03/08 v2.32.5 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4494,6 +4502,11 @@
\ifx\directlua\undefined\else%
\directlua{tex.enableprimitives("",{"textdir","pardir","bodydir"})}
\fi
+\ifluatex%
+ \ifnum\luatexversion<110%
+ \PackageWarning{reledmac}{You need to use LuaTeX 1.1.0 or higher}{\@ehc}%
+ \fi%
+\fi%
% \end{macrocode}
% \subsection{Boolean flags}
% \begin{macro}{\ifl@dmemoir}
@@ -4590,7 +4603,13 @@
% \end{macro}
% \end{macro}
% \end{macro}
-%
+% \begin{macro}{\led@err@samewordRTL}
+% \begin{macrocode}
+\newcommand*{\led@err@samewordRTL}{%
+ \reledmac@error{You can't use \string\sameword \MessageBreak with XeLaTeX \MessageBreak when typesetting RTL text.\MessageBreak Please use LuaTeX instead.}{\@ehc}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led@err@edtextoutsidepstart}
% \begin{macro}{\led@err@PstartInEdtext}
% \begin{macro}{\led@err@PendInEdtext}
@@ -7287,7 +7306,7 @@
% \end{macro}
% \end{macro}
% \begin{macro}{\new@line}
-% \begin{macro}{\l@the@c@page}
+% \begin{macro}{\set@this@c@page}
% The \protect\cs{new@line} macro sends the \protect\cs{@nl} command to the line-list
% file, to mark the start of a new text line, and its page number.
% \label{new@line@pagecounting}
@@ -7305,6 +7324,7 @@
% \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{new@line} to output page numbers}
% \begin{macrocode}
\newcommand*{\new@line}{%
+ \set@this@c@page%
\ifnumberline%
\IfStrEq{\led@pb@setting}{after}%
{\xifinlist{\the\absline@num}{\l@prev@nopb}%
@@ -7312,9 +7332,9 @@
{\numgdef{\@next@page}{\c@par@page+\@ne}%
\write\linenum@out{\string\@nl[\@next@page][\@next@page]}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}}%
{}%
\IfStrEq{\led@pb@setting}{before}%
{\numdef{\next@absline}{\the\absline@num+\@ne}%
@@ -7323,9 +7343,9 @@
{\numgdef{\nc@page}{\c@par@page+\@ne}%
\write\linenum@out{\string\@nl[\nc@page][\nc@page]}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}}%
}%
{}%
\IfStrEqCase{\led@pb@setting}%
@@ -7333,18 +7353,19 @@
{before}{\relax}%
{after}{\relax}%
}[%
- \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}%
+ \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}%
]%
\fi%
}
-\newcommand{\l@the@c@page}{%
+\newcount\@this@c@page%%
+\newcommand{\set@this@c@page}{%
\ifboolexpr{%
bool{sameparallelpagenumber}%
or bool{prevpgnotnumbered}%
}%
- {\the\c@par@page}%
- {\the\c@page}%
+ {\global\@this@c@page=\c@par@page}%
+ {\global\@this@c@page=\c@page}%
}%
% \end{macrocode}
% \end{macro}
@@ -8258,7 +8279,7 @@
% The general mechanism is the following:
% \begin{itemize}
% \item \textbf{At the first run}, each \protect\cs{sameword} command increments an \protect\package{etoolbox} counter the name of which contains the argument of the \protect\cs{sameword} commands.
-% \item Then this counter, associated with the argument of \protect\cs{sameword} is stored with the \protect\cs{@sw} command in the auxiliary file of the current \macpackage\ section (the \verb+.1+, \verb+.2+... file).
+% \item Then this counter, associated with the argument of \protect\cs{sameword} is stored with the \protect\cs{@sw} command in the auxiliary file of the current \macpackage\ section (the \verb+.1+, \verb+.2+\ldots\ file).
% \item \textbf{When this auxiliary file is read at the second run}, different operations are achieved:
% \begin{enumerate}
% \item Get the rank of each \protect\cs{sameword} in a line (relative rank) from the rank of each \protect\cs{sameword} in all the numbered section (absolute rank):
@@ -8329,13 +8350,8 @@
% \end{itemize}
% \end{itemize}
% After theory, implementation.
+% First, getting a sanitized form of the argument of \cs{sameword}
% \begin{macro}{\get@sw@txt}
-% As the argument of \protect\cs{sameword} can contain an active character if we
-% use \protect\package{inputenc} with \verb+utf8+ option instead of native UTF-8 engine,
-% we store its detokenized content in a macro in order to allow the dynamic name of macro with \protect\cs{csname}.\footnote{See \url{http://tex.stackexchange.com/q/244538/7712}.}
-%
-% Because there is a bug with \protect\cs{detokenize} and \XeTeX\ when using non BMP characters\footnote{\url{http://sourceforge.net/p/xetex/bugs/108/}},
-% we detokenize only for non-\XeTeX engines. In any case, in \XeTeX a \protect\cs{csname} construction can contain UTF-8 characters without a problem, as UTF-8 characters are not managed with category codes, but instead read directly as UTF-8 characters.
% \begin{macrocode}
\newcommand{\get@sw@txt}[1]{%
\begingroup%
@@ -8351,11 +8367,7 @@
% \end{macrocode}
% And now, define \cs{sw@txt}.
% \begin{macrocode}
- \ifxetex%
- \@tmpa{\xdef\sw@txt{#1}}%
- \else%
- \@tmpa{\expandafter\xdef\expandafter\sw@txt\expandafter{\detokenize{#1}}}%
- \fi%
+ \@tmpa{\protected@xdef\sw@txt{#1}}%
\endgroup%
}%
% \end{macrocode}
@@ -8393,6 +8405,11 @@
% The hight level macro \protect\cs{sameword}, used by the editor.
% \begin{macrocode}
\newcommandx{\sameword}[2][1,usedefault]{%
+ \ifxetex%
+ \if@RTL%
+ \led@err@samewordRTL%
+ \fi%
+ \fi%
\leavevmode%
\get@sw@txt{#2}%
% \end{macrocode}
@@ -8829,7 +8846,7 @@
}%
% \end{macrocode}
% Restore standard \enquote{nobreak} and \enquote{autopar} settings.
-% Normally, \cs{if@nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}\ ...\ \cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false.
+% Normally, \cs{if@nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}\ldots\ \cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false.
% \begin{macrocode}
\@nobreakfalse%
\ifautopar%
@@ -9123,6 +9140,7 @@
% Because of how this prints, a vertical spacing correction is added.
% \begin{macrocode}
\def\print@eledsection{%
+ \disable@edindex%
\if@firstlineofpage%
\set@Xtxtbeforenotes%
\set@txtbeforenotesX%
@@ -9153,6 +9171,7 @@
\fi%
\vskip-\baselineskip%
\continuousnumberingwithcolumns@sync@linenumber@singletext%
+ \restore@edindex%
}
% \end{macrocode}
% \end{macro}
@@ -12274,13 +12293,6 @@
\def\printlines#1|#2|#3|#4|#5|#6|#7|#8|{%
\begingroup%
% \end{macrocode}
-% If we use \LuaTeX, ensure we use good text's direction.
-% \begin{macrocode}
- \ifluatex%
- \edef\@tmp{\the\textdir}%
- \ifdefstring{\@tmp}{TLT}{}{\textdir TLT}%Test in order to prevent spurious space (bug #397)
- \fi%
-% \end{macrocode}
% Decide which part of line number components we will print.
% \begin{macrocode}
\setprintlines{#1}{#2}{#3}{#4}{#5}{#6}%
@@ -18000,6 +18012,8 @@
{\led@error@fail@patch@makeindex}%
\newcommand{\edindex}[1]{\@bsphack\@esphack}
\newcommandx{\dummy@edindex}[2][1=\expandonce\jobname,usedefault]{}%
+\newcommand{\disable@edindex}{\let\old@edindex\edindex\let\edindex\dummy@edindex}%
+\newcommand{\restore@edindex}{\let\edindex\old@edindex}%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -21453,6 +21467,11 @@
% \subsection{critical-keys for \emph{Emacs}}
% The \emph{Emacs} editor has a package to help inserting \macpackage's commands (Juan Manuel Macías Chaín).\\
% \url{https://gitlab.com/maciaschain/critical-keys}
+% \subsection{critical-marks for \emph{Emacs}}
+% A set of functions for \emph{Emacs} that run in the export process from Org Mode to
+% LaTeX and replace a series of simple textual marks with the basic \macpackage's commands (Juan Manuel Macías Chaín)
+% \url{https://gitlab.com/maciaschain/critical-marks}
+%\subsection{Import from TEI}
% \subsection{Import from TEI}
% There are multiple tools to convert from XML-TEI to \emph{reledmac}. Here is a non exhaustive-list:
% \begin{itemize}
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index c2b67b97c7..ab37c448c0 100644
--- a/macros/latex/contrib/reledmac/reledmac.pdf
+++ b/macros/latex/contrib/reledmac/reledmac.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx
index 2649200823..45e86de80e 100644
--- a/macros/latex/contrib/reledmac/reledpar.dtx
+++ b/macros/latex/contrib/reledmac/reledpar.dtx
@@ -225,7 +225,7 @@
% \changes{v1.15.0}{2015/04/13}{Fix vertical spurious space before right \protect\cs{eledchapter} (bug added in v1.13.0).}
% \changes{v1.15.0}{2015/04/13}{Prevent vertical space when using \protect\cs{AtEveryPstart} or \protect\cs{AtEveryPend} with a command which prints nothing}
% \changes{v1.16.0}{2015/05/18}{Fix a bug with nofamiliar / nocritical option of eledmac.}
-% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
+% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering} without \protect\cs{pstart}.}
% \changes{v1.16.0}{2015/05/18}{Error message when starting a Leftside/a Rightside while the previous one has not been yet typeset.}
% \changes{v1.16.0}{2015/05/18}{Error message when calling \protect\cs{Pages} inside `pages' environment and \protect\cs{Columns} inside `pairs' environment.}
% \changes{v1.16.0}{2015/05/18}{New package option sameparallelpagenumber to have the same page number for both left and right side.}
@@ -293,7 +293,7 @@
% \changes{v2.14.4}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
% \changes{v2.15.0}{2016/12/12}{Add \protect\option{movecolumnspositiononrightpage} option.}
% \changes{v2.15.0}{2016/12/12}{New macro \protect\cs{sidenotemarginR}, fix default value to right.}
-% \changes{v2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}}
+% \changes{v2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering}}
% \changes{v2.15.0}{2016/12/12}{Fix a bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).}
% \changes{v2.15.0}{2016/12/12}{Fix a bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).}
% \changes{v2.16.0}{2016/12/23}{Compatibility with \protect\cs{setmsdataposition}}
@@ -317,7 +317,7 @@
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\cs{continuousnumberingwithcolumns} when using multiple series of continued numbering text. Now, the line number are correctly reset at each \protect\cs{beginnumbering}.}
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} and inner / outer notes and line numbering.}
% \changes{v2.20.0}{2017/08/17}{Add \protect\cs{linenumOnlyPagesForColumns} and \protect\cs{linenumOnlyPagesForColumnsR} to tell to print the line numbers associated with a column only on some specific pages (for example, only on right pages).}
-% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
+% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering}.}
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{widthliketwocolumns} when manually setting \protect\cs{beforecolumnseparator} and \protect\cs{aftercolumnseparator}.}
% \changes{v2.20.0}{2017/08/17}{Fix compatibility between \protect\option{continuousnumberingwithcolumns} and \protect\cs{numberpstartfalse}.}
% \changes{v2.20.1}{2017/08/23}{Fix bug with \protect\option{continuousnumberingwithcolumns} when left column and right column have not the same size.}
@@ -338,6 +338,8 @@
% \changes{v2.22.1}{2019/01/08}{Really reset line number annotation at each line}
% \changes{v2.22.2}{2019/01/22}{Fix bug with \protect\cs{Xonlyside} and \protect\cs{onlysideX}}
% \changes{v2.22.3}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.}
+% \changes{v2.23.0}{2020/03/08}{Add \protect\cs{Leftpagehook} and \protect\cs{Rightpagehook}.}
+% \changes{v2.23.0}{2020/03/08}{Add hanging symbol feature into \protect\env{astanza}.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -627,8 +629,8 @@
% numbers between multiple columns and single columns, use the
% \option{continuousnumberingwithcolumns} option when loading \macpackage
% or \parpackage.
-% You will need to use \cs{pausenumbering}~...\
-% \cs{resumenumbering} in addition to \cs{beginnumbering}~...\
+% You will need to use \cs{pausenumbering}\ldots
+% \cs{resumenumbering} in addition to \cs{beginnumbering}\ldots
% \cs{endnumbering} (see \reff{reledmac-pause}).
%
% The best way to understand the behaviour of \cs{pausenumbering} and
@@ -640,15 +642,15 @@
% left-column commands.
%
% This means that you must switch between single-column and left-column
-% text using \cs{beginnumbering}~...\ \cs{pausenumbering}~...\
-% \cs{resumenumbering}~...\ \cs{pausenumbering}~...\
-% \cs{resumenumbering}~...\ \cs{endnumbering}.
+% text using \cs{beginnumbering}\ldots\cs{pausenumbering}\ldots
+% \cs{resumenumbering}\ldots\cs{pausenumbering}\ldots
+% \cs{resumenumbering}\ldots\cs{endnumbering}.
%
% On the other side, the first right column must always begin with
% \cs{beginnumbering}, no matter if the corresponding left-column started
% with \cs{resumenumbering} or not; this is because numbering in the right
% column has not been started yet. Then, for consecutive chunks of
-% right-column text you should use \cs{pausenumbering}~...\
+% right-column text you should use \cs{pausenumbering}\ldots
% \cs{resumenumbering}.
%
% You must use \cs{endnumbering} in a right column in the following cases:
@@ -1210,6 +1212,13 @@
%
% About these two hooks, read \macpackage's handbook (\reff{reledmac-linehook}).
%
+% \subsection{Executing code at each page}
+% \DescribeMacro{\Rightpagehook}
+% \DescribeMacro{\Leftpagehook}
+% When typesetting parallel pages, the \cs{Leftpagehook} and \cs{Rightpagehook} macros
+% are executed each time \Parpackage switches to Left / Right page.
+%
+% These macro are initially void. You can redefine them using \cs{renewcommand}.
% \section{Verse}
%
% If you are typesetting verses with \macpackage you can use the \protect\cs{stanza}
@@ -1386,7 +1395,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2019/11/04 v2.22.4 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/03/08 v2.23.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -2636,7 +2645,7 @@
%
% \begin{macro}{\l@d@set}
% The \protect\cs{l@d@set}\marg{num} macro sets
-% the line number for the next \verb?\pstart...? to the value specified as
+% the line number for the next \cs{pstart}\ldots\ to the value specified as
% its argument. This is used to implement \protect\cs{setlinenum}.
% It is defined in \macpackage.
% \changes{v2.0.0}{2015/07/19}{\protect\cs{l@d@set} defined only in \reledmac.}
@@ -3001,8 +3010,9 @@
% line-list file, to mark the start of a new text line.
% \begin{macrocode}
\newcommand*{\new@lineL}{%
+ \set@this@c@page%
\ifnumberline%
- \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}%
+ \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}%
\fi%
}%
% \end{macrocode}
@@ -3012,8 +3022,9 @@
% line-list file, to mark the start of a new text line.
% \begin{macrocode}
\newcommand*{\new@lineR}{%
+ \set@this@c@page%
\ifnumberline%
- \write\linenum@outR{\string\@nl[\the\c@par@page][\thepar@page]}%
+ \write\linenum@outR{\string\@nl[\the\@this@c@page][\thepage]}%
\fi%
}%
% \end{macrocode}
@@ -3051,7 +3062,7 @@
%
% \begin{macro}{\setline}
% You can use \protect\cs{setline}\marg{num}
-% in running text (i.e., within \verb?\pstart...\pend?) to set the
+% in running text (i.e., within \cs{pstart}\ldots\cs{pend}) to set the
% current visible
% line-number to a specified positive value.
% It is defined in \macpackage.
@@ -3413,6 +3424,15 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \begin{macro}{ifinastanzaL}
+% \begin{macro}{ifinastanzaR}
+% These boolean tests are switched by the \protect\env{astanza} environnement, using either the left or right side.
+% \begin{macrocode}
+ \newif\ifinastanzaL%
+ \newif\ifinastanzaR%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \begin{environment}{Leftside}
% Within the \verb?pairs? and \verb?pages? environments the left and
% right hand texts are within \verb?Leftside? and \verb?Rightside?
@@ -3461,6 +3481,15 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \begin{macro}{\Rightpagehook}
+% \begin{macro}{\Leftpagehook}
+% Hook at the start of Left/Right page, initially empty.
+% \begin{macrocode}
+\newcommand*{\Rightpagehook}{}%
+\newcommand*{\Leftpagehook}{}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
% \begin{environment}{Rightside}
% The \verb?Rightside? environment is only slightly more complicated
@@ -4056,6 +4085,7 @@
% \protect\cs{print@eledsectionL} is for line with macro code.
% \begin{macrocode}
\def\print@eledsectionL{%%
+ \disable@edindex%
\addtocounter{pstartL}{-1}%
\ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
\ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
@@ -4081,6 +4111,7 @@
{\new@line \hbox{\l@dunhbox@line{\one@line}}}%
\fi%
\vskip\eledsection@correcting@skip%
+ \restore@edindex%
}
% \end{macrocode}
@@ -4245,6 +4276,7 @@
}
\def\print@eledsectionR{%
+ \disable@edindex%
\addtocounter{pstartR}{-1}%
\set@sectcountR%
\ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}%
@@ -4270,7 +4302,8 @@
\hspace{3\paperwidth}%
{\new@lineR \hbox{\l@dunhbox@line{\one@lineR}}}%
\fi%
- \vskip\eledsection@correcting@skip
+ \vskip\eledsection@correcting@skip%
+ \restore@edindex%
}
% \end{macro}
% \end{macro}
@@ -5309,6 +5342,9 @@
\noexpand\csname sza@0@\endcsname}\stanzaindentbase%
\@hangingsymbol%
\fi%
+ \ifinastanzaL%
+ \@hangingsymbol%
+ \fi%
\fi%
}%
\newcommand{\inserthangingsymbolR}{%
@@ -5318,6 +5354,9 @@
\noexpand\csname sza@0@\endcsname}\stanzaindentbase%
\@hangingsymbol%
\fi%
+ \ifinastanzaR%
+ \@hangingsymbol%
+ \fi%
\fi%
}%
% \end{macrocode}
@@ -5344,6 +5383,11 @@
%
% \begin{macrocode}
\newenvironmentx{astanza}[2][1,2,usedefault]{%
+ \ifledRcol%
+ \global\inastanzaRtrue%
+ \else%
+ \global\inastanzaLtrue%
+ \fi%
\catcode`\&\active
\global\stanza@count\@ne\stanza@modulo\@ne
\newdimen\parindent@beforestanza%
@@ -5555,11 +5599,14 @@
% If use \protect\package{polyglossia}
% \changes{v1.8.0}{2014/08/05}{Correct left/right language setting with polyglossia.}
% \changes{v1.9.0}{2014/09/16}{Debug left/right language switching with polyglossia. Do not write in .aux file when setting left/right lines.}
-% \changes{v2.22.4}{2019/11/4}{Provide compatibility with lastet version of polyglossia (v1.45).}
+% \changes{v2.22.4}{2019/11/04}{Provide compatibility with last version of polyglossia (v1.45).}
+% \changes{v2.23.0}{2020/03/08}{Restore compatibility with version of polyglossia prior to v1.45.}
% \begin{macrocode}
{ \let\old@otherlanguage\otherlanguage%
\renewcommand{\otherlanguage}[2][]{%
- \xpg@set@group@aux%
+ \ifdefined\xpg@set@group@aux%
+ \xpg@set@group@aux%
+ \fi%
\selectlanguage[#1]{#2}%
\ifledRcol \gdef\theledlanguageR{#2}%
\else \gdef\theledlanguageL{#2}%
@@ -6241,8 +6288,8 @@
% \begin{macro}{setnotepositionliketwocolumns@R}
% The \protect\cs{setwidthliketwocolumns} macro is called in \protect\cs{beginnumbering} in a \textbf{non-parallel}
% typesetting context, to fix the width of the lines to be vertically aligned with parallel columns. It is also called at the beginning of a note's group, if some options are enabled.
-% The \protect\cs{setposition...} macros are called in \protect\cs{beginnumbering} in a \textbf{non- parallel} typesetting context to fix the position of the lines.
-% The \protect\cs{setnoteposition...} macros are called in \protect\cs{xxxfootstart} in a \textbf{non- parallel} typesetting context to fix the position of notes block.
+% The \protect\cs{setposition\ldots} macros are called in \protect\cs{beginnumbering} in a \textbf{non- parallel} typesetting context to fix the position of the lines.
+% The \protect\cs{setnoteposition\ldots} macros are called in \protect\cs{xxxfootstart} in a \textbf{non- parallel} typesetting context to fix the position of notes block.
% \begin{macrocode}
\newcommand{\setwidthliketwocolumns}{%
\get@intercolumns@width%As \columns is not necessary called before \setwidthliketwocolumns
@@ -6505,6 +6552,7 @@
% \changes{v0.2.0}{2004/12/20}{Added \protect\cs{l@duselanguage} to \protect\cs{Pages}}
% \begin{macrocode}
\checkpageL%
+ \Leftpagehook%
\l@duselanguage{\theledlanguageL}%
{ \loop\ifl@dsamepage%
% \end{macrocode}
@@ -6602,6 +6650,7 @@
% \changes{v0.3.0}{2005/02/10}{Added \protect\cs{ledstrutR} to \protect\cs{Pages}}
% \begin{macrocode}
\checkpageR%
+ \Rightpagehook%
\l@duselanguage{\theledlanguageR}%
{ \loop\ifl@dsamepage%
\set@sectcountR%
@@ -6698,6 +6747,8 @@
\global\l@dnumpstartsR=\z@%
\global\instanzaLfalse%
\global\instanzaRfalse%
+ \global\inastanzaLfalse%
+ \global\inastanzaRfalse%
\global\l@dprintingpagesfalse%
% \end{macrocode}
% Check the consistency of \cs{edtext@later} and \cs{edtext@now}
diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index a2ff6324dd..7db2af1159 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ
diff --git a/macros/xetex/latex/parsa/IntLogo.png b/macros/xetex/latex/parsa/IntLogo.png
deleted file mode 100644
index 8061fac985..0000000000
--- a/macros/xetex/latex/parsa/IntLogo.png
+++ /dev/null
Binary files differ
diff --git a/macros/xetex/latex/parsa/IranLogo.png b/macros/xetex/latex/parsa/IranLogo.png
deleted file mode 100644
index 9cb939712d..0000000000
--- a/macros/xetex/latex/parsa/IranLogo.png
+++ /dev/null
Binary files differ
diff --git a/macros/xetex/latex/parsa/README.txt b/macros/xetex/latex/parsa/README.md
index 1a320306f4..c22ed75a47 100644
--- a/macros/xetex/latex/parsa/README.txt
+++ b/macros/xetex/latex/parsa/README.md
@@ -1,8 +1,10 @@
____________________
-The Parsa package
-v1.1
+# parsa
+A XeLaTeX package for theses and dissertations at Iranian Universities as fast and as efficiently as possible.
+______________
+The Parsa package v1.2
-While time is limited, preparing thesis and dissertations take a lot of time for editing required forms.
+While time is limited, preparing theses and dissertations take a lot of time for editing required forms.
This package will help you to prepare the forms you need most easily and as soon as possible.
If you want to report any bugs or typos and corrections in the
@@ -13,15 +15,15 @@ documentation, please use the issue tracker:
In doing so, please always explain your issue well enough, and always
include a minimal working example showing the issue.
-Current version release date: 2019/12/14
+First version release date: 2019/12/12 Current version release date: 2020/3/6
______________
Farshad Rasuli
-Copyright (c) 2019
+Copyright (c) 2019-2020
Distributed under the LaTeX Project Public License
It may be distributed and/or modified under the LaTeX Project Public License,
version 1.3c or higher (your choice). The latest version of
this license is at: http://www.latex-project.org/lppl.txt
This work is “author-maintained” (as per LPPL maintenance status)
-by Farshad Rasuli. \ No newline at end of file
+by Farshad Rasuli.
diff --git a/macros/xetex/latex/parsa/minimaltemplate.pdf b/macros/xetex/latex/parsa/minimaltemplate.pdf
deleted file mode 100644
index e105a5ce63..0000000000
--- a/macros/xetex/latex/parsa/minimaltemplate.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/xetex/latex/parsa/minimaltemplate.tex b/macros/xetex/latex/parsa/minimaltemplate.tex
deleted file mode 100644
index 498e87702c..0000000000
--- a/macros/xetex/latex/parsa/minimaltemplate.tex
+++ /dev/null
@@ -1,230 +0,0 @@
-%
-% این پرونده دارای گواهی LPPL است %
-% و نباید در هیچ جایی آپلود شود؛ %
-% فقط مجاز به لینک دادن هستید. %
-% http://github.com/farshadrasuli/parsa %
-% استفاده از این پرونده به معنای پذیرش این قانون است. %
-% __________________________________________________
-% Copyright (c) 2019 Farshad Rasuli
-%
-%%
-%% This file is `minimaltemplate.tex'
-%%
-%% A prepared template
-%% for making your Thesis or Dissertation faster and more efficient than possible
-%%
-%% __________________________________________________
-%% Copyright (c) 2019 Farshad Rasuli
-%%
-%% It may be distributed and/or modified under the LaTeX Project Public License,
-%% version 1.3c or higher (your choice). The latest version of
-%% this license is at: http://www.latex-project.org/lppl.txt
-%%
-%% This work is “author-maintained” (as per LPPL maintenance status)
-%% by Farshad Rasuli.
-%%
-%%
-%% Location on CTAN: /macros/xetex/latex/parsa
-%%
-%% Issue tracker: http://github.com/farshadrasuli/parsa
-%%
-
-
-%----------------------------------------------------------------------------------------
-% DOCUMENT DEFINITION
-%----------------------------------------------------------------------------------------
-\documentclass[%
-12pt,% Options: 10pt, 11pt, 12pt
-twoside, % Other option: oneside
-openany, % Defaul option for book class is openright
-%twocolumn, % Use for two column typesetting
-thesis, % Other option: dissertation or comment this option for other purposes
-]{book}
-
-%----------------------------------------------------------------------------------------
-% PAGE LAYOUT
-%----------------------------------------------------------------------------------------
-\usepackage[
-papersize={210mm,297mm},% Specify the paper dimensions
-layoutsize={210mm,297mm}, layouthoffset=0mm, layoutvoffset=0mm, % Specify the dimensions of the layout and it's horizontal and vertical distance from the beginning of the paper.
-%showcrop, % Uncomment to see the layout boundaries
-top=25mm, includehead, % Margin from top to top of the header
-bottom=25mm, heightrounded, % Margin from Bottom
-bindingoffset=10mm, % Binding margin
-inner=12mm, outer=22mm, % The inner/outer edge of the layout (inner:outer ratio in two-side is 1:1.5)
-marginparwidth=0mm, marginparsep=0mm, % Specify the border width and distance from the bottom of the body of the text. (These marginal notes are placed inside the outer margin of the layout.)
-%columnsep=10mm % Adjust separation between columns in two column mode.
-%showframe, % This option is for drawing a border around the textbody.
-]{geometry}
-
-%----------------------------------------------------------------------------------------
-% HEADER AND FOOTER SETTINGS
-%----------------------------------------------------------------------------------------
-\usepackage{fancyhdr}
-% The default width of the headers and footers equals the width of the text. You can make the width wider (or narrower) by these commands to overhang the outside margin where the marginal notes are printed
-\addtolength{\headwidth}{\marginparwidth}
-\addtolength{\headwidth}{\marginparsep}
-
-%----------------------------------------------------------------------------------------
-% PACKAGES AND OTHER CONFIGURATIONS
-%----------------------------------------------------------------------------------------
-\usepackage{amsmath}
-\usepackage{amsfonts,amsthm,amssymb,amsbsy,amsopn,amstext}
-\usepackage{mhsetup,mathtools}
-\usepackage[usenames,dvpinames,table]{xcolor}
-\usepackage{color}
-\usepackage{wrapfig} % Provides the environments for typesetting a float and text wrap around it
-%\usepackage{subfig}
-\usepackage[hypcap=true]{caption}
-%\usepackage{capt-of}
-%\usepackage{subcaption}
-\usepackage{setspace}
-\usepackage[pagebackref=false]{hyperref}
-\usepackage[perpage]{footmisc} % This option resets footnote numbering for each page of the document.
-\usepackage[fulladjust]{marginnote} % The package might be used to create a note in the margin
-\usepackage{adjustbox}
-
-%----------------------------------------------------------------------------------------
-% PARSA AND XEPERSIAN PACKAGE AND CONFIGURATIONS
-%----------------------------------------------------------------------------------------
-\usepackage{parsa}
-\usepackage[localise,fontsloadable]{xepersian}
-\settextfont{IRZar} % Specify main content font with a unicode Persian font
-\defpersianfont\ParsaHeaderFont{IRNazanin} % Specify font of the header
-
-%----------------------------------------------------------------------------------------
-% SETTINGS AND CONFIGURATIONS
-%----------------------------------------------------------------------------------------
-%\linespread{1.33} % Adjust line spacing by a factor. The factor <1.33> is for 1.5x and <1.67> for 2x.
-\setcounter{secnumdepth}{5} % Controls printing of section heading numbers at any depth > {level}, where chapter is level zero
-\setcounter{tocdepth}{2} % Controls displaying of section heading numbers in table of content at any depth > {level}, where chapters are level zero.
-%\numberwithin{equation}{chapter} % This command resets equation numbering, which are defined by equation environment for each chapter of the document.
-\SepMark{-} % Changes the section heading number separator
-%\renewcommand{\bibname}{منابع و مراجع} % Converting the word `کتاب‌نامه' into `منابع و مراجع'
-
-%----------------------------------------------------------------------------------------
-% THESIS/DISSERTATION INFORMATION STARTS FROM HERE:
-%
-
-% --- Institute's Information
-\InstituteLogo{IranLogo}{IntLogo}[30mm][30mm] % {<Iranian logo>}{<International logo>}[<width>][<height>}
-\Institute{(نام مؤسسه)}{(Institute's Name)} % {<persian>}{<latin>}
-\Faculty{(نام دانش‌کده)}{(faculty of ...)} % {<persian>}{<latin>}
-\Department{(نام گروه)}{(Department of ...)} % {<persian>}{<latin>}
-
-% --- Student's Information
-\StudentName{(نام دانشجو)}{(Student's Name)} % {<persian>}{<latin>}
-\StudentMajor{(رشته)}{(Major Discipline)} % {<persian>}{<latin>}
-\StudentMinor{(گرایش)}{(Minor Discipline)} % {<persian>}{<latin>}
-\StudentDegree{کارشناسی‌ارشد}{(Master)} % {<persian>}{<latin>}
-\StudentID{(9876543210)} % {<national ID>}
-\StudentNumber{(0123456789)}
-\StudentEMAIL{(sample@site.com)}
-
-% --- Thesis/Dissertation's Information
-\ParsaTitle{(عنوان): (زیرعنوان)}{(Title): (Subtitle)} % {<persian>}{<latin>}
-\ParsaCompilationDate{(آذر ۱۳۹۸)}{(December, 2019)} % {<persian date>}{<latin date>}
-\ParsaExamDate{(1398/09/21)}{(2019/12/12)} % {<persian date>}{<latin date>}
-
-% --- Members of Committee's Informtion
-\SupervisorName{(نام استاد راهنما)}{(Supervisor's Name)} % {<persian>}{<latin>}
-\SupervisorTitle{(استاد)}{(Professor)} % {<persian>}{<latin>}
-\SupervisorAffiliation{(نام مؤسسه)}{(Institute's Name)} % {<persian>}{<latin>}
-\SupervisorID{(9876543210)} %{<national ID>}
-\SupervisorEMAIL{(example@institute.edu)}
-
-\SecondSupervisorName{(نام استاد راهنمای دوم)}{(Second Supervisor's Name)} % {<persian>}{<latin>}
-\SecondSupervisorTitle{(دانشیار)}{(Associated Professor)} % {<persian>}{<latin>}
-%\SecondSupervisorAffiliation{}{} % {<persian>}{<latin>}
-%\SecondSupervisorID{} % {<national ID>}
-%\SecondSupervisorEMAIL{}
-
-\CosupervisorName{(نام استاد مشاور اول)}{(First Co-superviser's Name)} % {<persian>}{<latin>}
-\CosupervisorTitle{(استادیار)}{(Assistant Prosessor)} % {<persian>}{<latin>}
-%\CosupervisorAffiliation{}{} % {<persian>}{<latin>}
-%\CosupervisorID{} % {<national ID>}
-%\CosupervisorEMAIL{}
-
-\SecondCosupervisorName{(نام استاد مشاور دوم)}{(Second Co-supervisor's Name)} % {<persian>}{<latin>}
-%\SecondCosupervisorTitle{}{} % {<persian>}{<latin>}
-%\SecondCosupervisorAffiliation{}{} % {<persian>}{<latin>}
-%\SecondCosupervisorID{} % {<national ID>}
-%\SecondCosupervisorEMAIL{}
-
-\FirstExaminerName{(نام استاد داور)}{~} % {<persian>}{<latin>}
-%\FirstExaminerTitle{}{} % {<persian>}{<latin>}
-%\FirstExaminerAffiliation{}{} % {<persian>}{<latin>}
-%\FirstExaminerID{} % {<national ID>}
-%\FirstExaminerEMAIL{}
-
-\SecondExaminerName{(نام استاد داور)}{~} % {<persian>}{<latin>}
-%\SecondExaminerTitle{}{} % {<persian>}{<latin>}
-%\SecondExaminerAffiliation{}{} % {<persian>}{<latin>}
-%\SecondExaminerID{} % {<national ID>}
-%\SecondExaminerEMAIL{}
-
-\ThirdExaminerName{(نام استاد داور)}{} % {<persian>}{<latin>}
-%\ThirdExaminerTitle{}{} % {<persian>}{<latin>}
-%\ThirdExaminerAffiliation{}{} % {<persian>}{<latin>}
-%\ThirdExaminerID{} % {<national ID>}
-%\ThirdExaminerEMAIL{}
-
-\RepresentativeName{(نام نماینده تحصیلات تکمیلی)}{(The representative's name)} % {<persian>}{<latin>}
-%\RepresentativeID{} % {<national ID>}
-%\RepresentativeEMAIL{}
-
-%
-% THESIS/DISSERTATION INFORMATION ENDED.
-%----------------------------------------------------------------------------------------
-
-\begin{document}
-\pagestyle{empty}
-
-\titlepageParsi
-\newpage
-%----------------------------------------------------------------------------------------
-% PERSIAN ABSTRACT STARTS FROME HERE:
-%
-\begin{ParsaAbstractParsi}
-چکیده شامل خلاصه‌ای از هدف یا مسأله‌ی پژوهش، روش‌شناسی، نتایج و تفسیر می‌باشد که خواننده با مطالعه‌ی آن از محتوای پژوهش آگاه می‌شود. در چکیده از اشاره به تاریخچه، تفصیل اقوال، توصیف تکنیک‌ها، فصل بندی، ذکر منابع و آوردن فرمول‌ها، نمودارها و جداول پرهیز شود. متن چکیده حداکثر دارای سی‌صد کلمه باشد و در یک صفحه و در یک پاراگراف نوشته شود. همچنین واژگان کلیدی در یک سطر جداگانه درج می‌شود و تعداد آن بین پنح تا هشت کلمه است. \بند \bigskip
-
-\متن‌سیاه{کلمات کلیدی:} پایان‌نامه، رساله، شیوه‌نامه، قالب آماده، زی‌پرشین، پارسا
-\end{ParsaAbstractParsi}
-%
-% PERSIAN ABSTRACT ENDED.
-%----------------------------------------------------------------------------------------
-\ParsaPicture{picture}
-
-\ParsaCredit
-\newpage
-
-\ExaminationReportPa
-\newpage
-
-\ParsaCopyleft
-\newpage
-
-\ParsaDedicate{تقدیم به ...}
-
-\begin{ParsaAcknowledge}
-متن سپاس‌گذاری...
-\end{ParsaAcknowledge}
-\newpage
-
-
-\chapter{فصل نمونه}
-محتوای اصلی نوشتار از اینجا آغاز می‌شود...
-
-\pagestyle{empty}
-
-\begin{ParsaCV}
-کارنامک، شمایی کوتاه از کارهای علمی و درجه‌های تحصیلی دانش‌آموخته را نشان می‌دهد و بهتر است به زبان سوم شخص (غایب) نوشته شود. این بخش برای دانش‌آموختگان کارشناسی ارشد، اختیاری و برای دانش‌آموختگان دکترا الزامی است. برای کسانی که پارسا را به زبانی به‌جز فارسی می‌نویسند این کارنامک نیز باید به همان زبان نوشته شود. نمونه‌ای از این کارنامک در ادامه نوشته شده است. \\
-
-رضا تهرانی دانش‌آموخته‌ی دکترای تخصصی رشته‌ی زبان و ادبیات فارسی از دانشگاه ایران در گرایش نگارش علمی در سال ۱۳۹۶ است. او در سال ۱۳۹۰ کارشناسی ارشد خود را از دانشگاه ایران در رشته‌ی تاریخ ادبیات گرایش نگارش در نوشتار علمی و کارشناسی خود را در سال ۱۳۸۷ از دانشگاه ایران در رشته‌ی تاریخ ادبیات دریافت کرد. زمینه‌های پژوهش او نوشتارهای علمی، تاریخ ادبیات و ویرایش تخصصی است. \\
-\end{ParsaCV}
-
-\ExaminationReportLa
-\newpage
-
-\titlepageLatin
-\end{document} \ No newline at end of file
diff --git a/macros/xetex/latex/parsa/parsa-doc.pdf b/macros/xetex/latex/parsa/parsa-doc.pdf
index 683edbcace..658d260597 100644
--- a/macros/xetex/latex/parsa/parsa-doc.pdf
+++ b/macros/xetex/latex/parsa/parsa-doc.pdf
Binary files differ
diff --git a/macros/xetex/latex/parsa/parsa-doc.tex b/macros/xetex/latex/parsa/parsa-doc.tex
index efc13306bb..0b30fc7267 100644
--- a/macros/xetex/latex/parsa/parsa-doc.tex
+++ b/macros/xetex/latex/parsa/parsa-doc.tex
@@ -1,32 +1,83 @@
-\documentclass[12pt,a4paper,twoside,fleqn,notitlepage,openany]{extarticle}
-
+%----------------------------------------------------------------------------------------
+% DOCUMENT DEFINITION
+%----------------------------------------------------------------------------------------
+\documentclass[%
+12pt,% Options: 10pt, 11pt, 12pt
+twoside, % Selects one- or two-sided layout; default is oneside, except for the book class.
+openany, % Determines if a chapter should start on a right-hand page; default is openright for book.
+%twocolumn, % Typeset in one or two columns; default is onecolumn.
+notitlepage,%
+fleqn,%
+]{article}
+
+%----------------------------------------------------------------------------------------
+% PAGE LAYOUT
+%----------------------------------------------------------------------------------------
\usepackage[
papersize={210mm,297mm},% Specify the paper dimensions
-layoutsize={210mm,297mm}, layouthoffset=0cm, layoutvoffset=0cm, % Specify the dimensions of the layout and it's horizontal and vertical distance from the beginning of the paper.
+layoutsize={210mm,297mm}, layouthoffset=0mm, layoutvoffset=0mm, % Specify the dimensions of the layout and it's horizontal and vertical distance from the beginning of the paper.
%showcrop, % Uncomment to see the layout boundaries
-top=2.4cm, includehead, % Margin from top to top of the header
-bottom=3.2cm, heightrounded, % Margin from Bottom
+top=24mm, includehead, % Margin from top to top of the header
+bottom=32mm, heightrounded, % Margin from Bottom
bindingoffset=10mm, % Binding margin
inner=21mm, outer=31mm, % The inner/outer edge of the layout (inner:outer ratio in two-side is 1:1.5)
-marginparwidth=0cm, marginparsep=3mm, % Specify the border width and distance from the bottom of the body of the text. (These marginal notes are placed inside the outer margin of the layout.)
-%columnsep=1cm % Adjust separation between columns in two column mode.
+marginparwidth=0mm, marginparsep=0mm, % Specify the border width and distance from the bottom of the body of the text. (These marginal notes are placed inside the outer margin of the layout.)
+%columnsep=10mm % Adjust separation between columns in two column mode.
%showframe, % This option is for drawing a border around the textbody.
]{geometry}
-\usepackage{hyperref}
-\usepackage{fancyhdr}
-\usepackage[perpage]{footmisc}
-\usepackage{float}
-\usepackage{adjustbox}
-\usepackage{pdfpages}
-\usepackage{parsa}
+%----------------------------------------------------------------------------------------
+% HEADER AND FOOTER SETTINGS
+%----------------------------------------------------------------------------------------
+\usepackage{fancyhdr} % Extensive control of page headers and footers in LATEX2ε.
+
+\fancypagestyle{plain}{\fancyhf{}\fancyfoot[OL,ER]{\HeaderFont \thepage}\renewcommand{\headrulewidth}{0pt}}
+
+\fancypagestyle{headings}{\fancyhf{}\fancyhead[OL,ER]{\HeaderFont \thepage}\fancyhead[OR]{\ParsaHeaderFont \rightmark}\fancyhead[EL]{\HeaderFont \leftmark}\renewcommand{\headrulewidth}{0.3pt}}
+
+% The default width of the headers and footers equals the width of the text. You can make the width wider (or narrower) by these commands to overhang the outside margin where the marginal notes are printed.
+\addtolength{\headwidth}{\marginparwidth}
+\addtolength{\headwidth}{\marginparsep}
+
+%----------------------------------------------------------------------------------------
+% PACKAGES AND OTHER CONFIGURATIONS
+%----------------------------------------------------------------------------------------
+\usepackage{amsmath}
+\usepackage{amsfonts,amsthm,amssymb,amsbsy,amsopn,amstext}
+\usepackage{mhsetup,mathtools}
+\usepackage{color} % Colour control for LATEX documents.
+\usepackage[usenames,dvpinames,table]{xcolor} % Driver-independent color extensions for LATEX and pdfLATEX.
+\usepackage{graphics} % Standard LATEX graphics.
+\usepackage{graphicx} % Enhanced support for graphics.
+\usepackage{float} % Improved interface for floating objects.
+\usepackage{adjustbox} % The package provides several macros to adjust boxed content.
+\usepackage[hypcap=true]{caption} % Customising captions in floating environments.
+\usepackage{setspace} % Set space between lines with the \singlespacing, \onehalfspacing, and \doublespacing commands.
+\usepackage[pagebackref=false]{hyperref}
+\usepackage[perpage]{footmisc} % A collection of ways to change the typesetting of footnotes. The package provides a way to number footnotes per page (the perpage option).
+\usepackage{longtable} % The package provides the longtable environment, a multi-page version of tabular.
+\usepackage[fulladjust]{marginnote} % The package might be used to create a note in the margin with the \marginnote command.
+
+
+% --- Other packages
+
+
+%----------------------------------------------------------------------------------------
+% XEPERSIAN PACKAGE AND CONFIGURATIONS
+%----------------------------------------------------------------------------------------
\usepackage[localise,fontsloadable]{xepersian}
-\settextfont{IRZar}
-\defpersianfont\ParsaHeaderFont{IRNazanin}
-
-\fancypagestyle{plain}{\fancyhf{}\fancyfoot[OL,ER]{\thepage}\renewcommand{\headrulewidth}{0pt}}
+\settextfont{XB Zar} % Specify main content font with a unicode Persian font.
+\defpersianfont\HeaderFont{XB Kayhan} % Specify font of the header.
+\setlatintextfont{Times New Roman} % Specify font of the non-persian contents.
-\SepMark{-}
+%----------------------------------------------------------------------------------------
+% SETTINGS AND CONFIGURATIONS
+%----------------------------------------------------------------------------------------
+%\linespread{1.33} % Adjust line spacing by a factor. The factor <1.33> is for 1.5x and <1.67> for 2x.
+\setcounter{secnumdepth}{5} % Controls printing of section heading numbers at any depth > {level}, where chapter is level zero.
+\setcounter{tocdepth}{2} % Controls displaying of section heading numbers in table of content at any depth > {level}, where chapters are level zero.
+\numberwithin{equation}{section} % This command resets equation numbering, which are defined by equation environment for each chapter of the document.
+\SepMark{-} % Changes the section heading number separator.
\begin{document}
@@ -37,7 +88,7 @@ marginparwidth=0cm, marginparsep=3mm, % Specify the border width and distance fr
\عنوان‌ساز
\begin{center}
\begin{minipage}{0.67\textwidth}
-تألیف پایان‌نامه و رساله، چهارچوب از پیش تعیین شده‌ای مانند چگونگی درج سربرگ، ساخت و تکمیل فرم‌های مربوطه و تدوین عناصر مختلف دارد\@. این بسته با هدف تولید فرم‌های مورد نیاز، به منطور تسریع فرآیند تألیف پایان‌نامه و رساله توسط دانشجو-پژوهش‌گر تهیه شده‌است\@. \\
+تألیف پایان‌نامه و رساله، چهارچوب از پیش تعیین شده‌ای مانند چگونگی درج سربرگ، ساخت و تکمیل فرم‌های مربوطه و تدوین عناصر مختلف دارد\@. این بسته با هدف تولید فرم‌های مورد نیاز، به منطور تسریع فرآیند تألیف پایان‌نامه و رساله توسط دانشجو‑پژوهشگر تهیه شده‌است\@. \\
امیدوارم با استفاده از این بسته، در مدت زمان تهیه‌ی پایان‌نامه و رساله، صرفه‌جویی کافی حاصل شود و به جای صرف وقت به ویرایش پایان‌نامه، زمان بیشتری به مسائل پژوهشی اختصاص یابد\@.
\end{minipage}
\end{center}
@@ -47,151 +98,274 @@ marginparwidth=0cm, marginparsep=3mm, % Specify the border width and distance fr
از جناب آقای \موکد{وفا کارن‌پهلو} بابت تهیه و توسعه‌ی بسته‌ی \موکد{زی‌پرشین} سپاس‌گزاری می‌کنم و برای ایشان آرزوی سلامتی و سعادت دارم\@. کار بی‌نظیر ایشان در تهیه‌ی بسته‌ی زی‌پرشین، الهام بخش تهیه‌ی بسته‌ی \موکد{پارسا} بوده‌است.
\section{شروع کار}
-طبقه‌ی نوشتار \زیرنویس{\متن‌لاتین{documentclass}} را از نوع کتاب انتخاب کنید و سپس با استفاده از فرمان
-\[\textrm{\lr{\texttt{$\backslash$usepackage[\textrm{<options>}]\{parsa\}}}}\]
-بسته‌ی پارسا فعال می‌شود\@. برای گزینه‌های این بسته، \متن‌لاتین{[\emph{<options>}]}، قسمت (\رجوع{ParsaInf}) را ببینید.\\
-اکنون بسته‌ی \XePersian ~را فعال کنید\@.
-\[ \textrm{ \lr{ \texttt{$\backslash$usepackage\{xepersian\}} } } \]
-قلم اصلی متن را با فرمان
-\[ \textrm{ \lr{ \texttt{$\backslash$settextfont\{\textrm{<font>}\} } } } \]
-و قلم سربرگ را با فرمان
-\[ \textrm{ \lr{ \texttt{$\backslash$defpersianfont$\backslash$ParsaHeaderFont\{\textrm{<font>}\} } } } \]
-تعیین کنید\@. توصیه می‌شود برای قلم اصلی، از قلم زر \زیرنویس{توسعه‌دهندگان مختلف، نسخه‌های متفاوتی از قلم زر با نام‌های \متن‌لاتین{B Zar}،\متن‌لاتین{XB Zar} و \متن‌لاتین{IRZar} ~منتشر کرده‌اند که استفاده از \متن‌لاتین{IRZar} ~توصیه می‌شود.} و برای قلم سربرگ، از قلم نازنین \زیرنویس{از بین نسخه‌های متفاوت قلم نازنین با نام‌های \متن‌لاتین{B Nazanin}، \متن‌لاتین{XB Nazanin} و \متن‌لاتین{IRNazanin} ~استفاده از \متن‌لاتین{IRNazanin} ~توصیه می‌شود.} استفاده کنید\@.
+طبقه‌ی نوشتار \زیرنویس{\متن‌لاتین{documentclass}} را از نوع کتاب انتخاب کرده و سپس با استفاده از فرمان زیر بسته‌ی \موکد{پارسا} فراخوانی کنید\@.
+\begin{latin}\begin{verbatim}
+\usepackage[<options>]{parsa}
+\end{verbatim} \end{latin}
+برای گزینه‌های این بسته، $\tt{[<options>]}$ ، قسمت \رجوع{ParsaInf} را ببینید\@. اکنون بسته‌ی \XePersian ~را فراخوانی کنید\@.
+\begin{latin}\begin{verbatim}
+\usepackage{xepersian}
+\end{verbatim} \end{latin}
+قلم اصلی متن را با فرمان زیر تعیین کنید\@. توصیه می‌شود برای قلم اصلی، از قلم زر \زیرنویس{توسعه‌دهندگان مختلف، نگارش‌های متفاوتی از قلم زر با نام‌های \متن‌لاتین{B Zar}، \متن‌لاتین{XB Zar}، \متن‌لاتین{XW Zar}، و \متن‌لاتین{IRZar} ~منتشر کرده‌اند که استفاده از \متن‌لاتین{XB Zar} ~توصیه می‌شود.} استفاده کنید\@.
+\begin{latin}\begin{verbatim}
+\settextfont{<font name>}
+\end{verbatim} \end{latin}
+قلم سربرگ را با فرمان زیر تعیین کنید\@. توصیه می‌شود برای قلم سربرگ، از قلم نازنین \زیرنویس{از بین نگارش‌های متفاوت قلم نازنین با نام‌های \متن‌لاتین{B Nazanin}، \متن‌لاتین{XB Kayhan}، و \متن‌لاتین{IRNazanin} ~استفاده از \متن‌لاتین{XB Kayhan} ~توصیه می‌شود.} استفاده کنید\@.
+\begin{latin}\begin{verbatim}
+\defpersianfont\ParsaHeaderFont{<font name>}
+\end{verbatim} \end{latin}
\section{ورود اطلاعات}
-برای وارد کردن اطلاعات پایان‌نامه (یا رساله)، فرمان مد نظر خود را، مطابق دستورات شرح داده‌شده، در قسمت سرآغاز \زیرنویس{\متن‌لاتین{preamble}}~وارد کنید.
+برای وارد کردن اطلاعات پایان‌نامه (یا رساله)، فرمان مورد نظر خود را، مطابق دستورات شرح داده‌شده، در قسمت سرآغاز \زیرنویس{\متن‌لاتین{preamble}}~وارد کنید.
\subsection{اطلاعات مؤسسه}
-نام مؤسسه‌ی محل تحصیل خود را با فرمان
-\[ \textrm{ \lr{ \texttt{$\backslash$Institute\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-وارد کنید. دقت شود که آرگومان اول، \{\emph{<persian>}\}، برای ورود اطلاعات به زبان پارسی و آرگومان دوم، \{\emph{<latin>}\}، برای ورود اطلاعات به لاتین درنظر گرفته شده است. این اصل برای تمام فرمان‌های این بسته که دو آرگومان دارند رعایت شده است\@. به همین صورت، برای سایر اطلاعات از فرمان‌ها به شرح زیر استفاده کنید\@. \\
-نشان مؤسسه:
-\[ \textrm{ \lr{ \texttt{$\backslash$InstituteLogo\{\textrm{<Iranian logo>}\}\{\textrm{<International logo>}\}[\textrm{<width>}][\textrm{<height>}]} } } \]
-با آرگومان‌های اختیاری، پهنا و بلندای نشان مؤسسه را، در صفحه‌ی عنوان تنظیم کنید. مقدار پیش‌فرض ۳۰×۳۰ میلی‌متر است\@. \\
-نام دانش‌کده یا پژوهش‌کده:
-\[ \textrm{ \lr{ \texttt{$\backslash$Faculty\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-نام گروه:
-\[ \textrm{ \lr{ \texttt{$\backslash$Department\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
+اطلاعات مؤسسه را با فرمان‌های زیر وارد کنید\@. \بند
+• نام مؤسسه:
+\begin{latin}\begin{verbatim}
+\Institute{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+دقت شود که آرگومان اول، $\left\lbrace \tt{<persian>} \right\rbrace $، برای ورود اطلاعات به زبان پارسی و آرگومان دوم، $\left\lbrace \tt{<latin>} \right\rbrace $، برای ورود اطلاعات به لاتین درنظر گرفته شده است. این اصل برای تمام فرمان‌های این بسته که دو آرگومان دارند رعایت شده است\@. به همین صورت، برای وارد کردن سایر اطلاعات، از فرمان‌ها به شرح زیر استفاده کنید\@. \بند
+• نشان مؤسسه:
+\begin{latin}\small \begin{verbatim}
+\InstituteLogo{<Iranian logo>}{<International logo>}[<width>][<height>]
+\end{verbatim} \end{latin}
+با آرگومان‌های اختیاری، پهنا و بلندای نشان مؤسسه را، در صفحه‌ی عنوان تنظیم کنید. مقدار پیش‌فرض ۳۰×۳۰ میلی‌متر است\@. \بند
+• نام دانشکده یا پژوهشکده:
+\begin{latin}\begin{verbatim}
+\Faculty{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• نام گروه:
+\begin{latin}\begin{verbatim}
+\Department{<persian>}{<latin>}
+\end{verbatim} \end{latin}
\subsection{اطلاعات نگارنده}
-برای وارد کردن اطلاعات نگارنده، از فرمان‌های زیر استفاده کنید\@. چنان‌چه قصد دارید که یکی از دو آرگومان فرمانی را خالی بگذارید، کافی‌است از نشانه‌ی مد ($\sim$) استفاده کنید\@. \\
-نام کامل نگارنده‌ی اثر:
-\[ \textrm{ \lr{ \texttt{$\backslash$StudentName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-رشته‌ی تحصیلی:
-\[ \textrm{ \lr{ \texttt{$\backslash$StudentMajor\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-گرایش تحصیلی:
-\[ \textrm{ \lr{ \texttt{$\backslash$StudentMinor\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-مقطع تحصیلی:
-\[ \textrm{ \lr{ \texttt{$\backslash$StudentDegree\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$StudentID\{\textrm{<national ID number>}\}} } } \]
-شماره دانشجویی:
-\[ \textrm{ \lr{ \texttt{$\backslash$StudentNumber\{\textrm{<Student Number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$StudentEMAIL\{\textrm{<sample@site.com>}\}} } } \]
+برای وارد کردن اطلاعات نگارنده، از فرمان‌های زیر استفاده کنید\@. چنان‌چه قصد دارید که یکی از دو آرگومان فرمانی را خالی بگذارید، کافی‌است از نشانه‌ی مد ($\sim$) استفاده کنید\@. \بند
+• نام کامل نگارنده‌ی اثر:
+\begin{latin}\begin{verbatim}
+\StudentName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رشته‌ی تحصیلی:
+\begin{latin}\begin{verbatim}
+\StudentMajor{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• گرایش تحصیلی:
+\begin{latin}\begin{verbatim}
+\StudentMinor{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• مقطع تحصیلی:
+\begin{latin}\begin{verbatim}
+\StudentDegree{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\StudentID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره دانشجویی:
+\begin{latin}\begin{verbatim}
+\StudentNumber{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\StudentEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
\subsection{اطلاعات سند} \label{ParsaInf}
-باید نوع سندی که قصد تهیه‌‌ی آن را دارید، از آن جهت که پایان‌نامه است یا رساله، مشخص کنید\@. هنگام فراخوانی بسته‌ی پارسا، امکان استفاده از گزینه‌ی \متن‌لاتین{\متن‌تایپ{thesis}} ~یا \متن‌لاتین{\متن‌تایپ{dissertation}} ~وجود دارد که گزینه‌ی \متن‌لاتین{\متن‌تایپ{thesis}} ~نوع سند را پایان‌نامه و گزینه‌ی \متن‌لاتین{\متن‌تایپ{dissertation}} ~نوع سند را رساله تعیین می‌کند. چنان‌چه از این گزینه‌ها استفاده نکردید، می‌توانید با فرمان
-\[ \textrm{ \lr{ \texttt{$\backslash$ParsaTarget\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-نوع سند خود را مشخص کنید\@. برای سایر اطلاعات سند، از فرمان‌های زیر استفاده کنید\@. \\
-عنوان سند:
-\[ \textrm{ \lr{ \texttt{$\backslash$ParsaTitle\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-تاریخ تدوین که در صفحه‌ی عنوان درج می‌شود (به صورت ماه و سال وارد شود):
-\[ \textrm{ \lr{ \texttt{$\backslash$ParsaCompilationDate\{\textrm{<persian date>}\}\{\textrm{<International date>}\}} } } \]
-تاریخ دقیق دفاع از پایان‌نامه یا رساله:
-\[ \textrm{ \lr{ \texttt{$\backslash$ParsaExamDate\{\textrm{<persian date>}\}\{\textrm{<International date>}\}} } } \]
+اطلاعات سند را با فرمان‌های زیر وارد کنید\@. \بند
+• نوع سند: باید نوع سندی که قصد تهیه‌‌ی آن را دارید، از آن جهت که پایان‌نامه است یا رساله، مشخص کنید\@. هنگام فراخوانی بسته‌ی پارسا، امکان استفاده از گزینه‌ی \متن‌لاتین{\متن‌تایپ{thesis}} ~یا \متن‌لاتین{\متن‌تایپ{dissertation}} ~وجود دارد\@. گزینه‌ی \متن‌لاتین{\متن‌تایپ{thesis}} ~برای انتخاب \موکد{پایان‌نامه} و گزینه‌ی \متن‌لاتین{\متن‌تایپ{dissertation}} ~برای انتخاب \موکد{رساله} استفاده می‌گردد\@. چنان‌چه از این گزینه استفاده نکردید، می‌توانید با فرمان زیر نوع سند خود را مشخص کنید\@.
+\begin{latin}\begin{verbatim}
+\ParsaTarget{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• عنوان سند:
+\begin{latin}\begin{verbatim}
+\ParsaTitle{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• تاریخ تدوین که در صفحه‌ی عنوان درج می‌شود (به صورت ماه و سال وارد شود):
+\begin{latin}\begin{verbatim}
+\ParsaCompilationDate{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• تاریخ دقیق دفاع از پایان‌نامه یا رساله:
+\begin{latin}\begin{verbatim}
+\ParsaExamDate{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
\subsection{اطلاعات استاد راهنما} \label{SupInf}
-اطلاعات استاد راهنما را با فرمان‌های زیر وارد کنید\@. \\
-نام کامل استاد راهنما:
-\[ \textrm{ \lr{ \texttt{$\backslash$SupervisorName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-سمت یا مرتبه‌ی علمی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SupervisorTitle\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-وابستگی سازمانی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SupervisorAffiliation\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SupervisorID\{\textrm{<national ID number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$SupervisorEMAIL\{\textrm{<sample@site.com>}\}} } } \]
+اطلاعات استاد راهنما را با فرمان‌های زیر وارد کنید\@. \بند
+• نام کامل استاد راهنما:
+\begin{latin}\begin{verbatim}
+\SupervisorName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• سمت یا مرتبه‌ی علمی:
+\begin{latin}\begin{verbatim}
+\SupervisorTitle{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• وابستگی سازمانی:
+\begin{latin}\begin{verbatim}
+\SupervisorAffiliation{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\SupervisorID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\SupervisorEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
\subsection{اطلاعات استاد راهنمای دوم}
-همانند استاد راهنما، قسمت (\رجوع{SupInf})، اطلاعات استاد راهنمای دوم را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. روند ورود اطلاعات سایر اعضای کمیته‌ی دفاع، مانند استادان مشاور، استادان داور و نماینده‌ی تحصیلات تکمیلی نیز به همین صورت می‌باشد\@. \\
-نام کامل استاد راهنمای دوم:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondSupervisorName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-سمت یا مرتبه‌ی علمی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondSupervisorTitle\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-وابستگی سازمانی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondSupervisorAffiliation\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondSupervisorID\{\textrm{<national ID number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondSupervisorEMAIL\{\textrm{<sample@site.com>}\}} } } \]
+همانند استاد راهنما، قسمت \رجوع{SupInf}، اطلاعات استاد راهنمای دوم را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. با ورود اطلاعات استاد راهنمای دوم، عبارت \موکد{استاد راهنما} درج شده در صفحه عنوان به \موکد{استادان راهنما} تغییر می‌کند\@. اگر یک استاد راهنما دارید، از استفاده از این فرمان‌ها به هر شکلی صرف نظر کنید\@. \بند
+• نام کامل استاد راهنمای دوم:
+\begin{latin}\begin{verbatim}
+\SecondSupervisorName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
+• سمت یا مرتبه‌ی علمی:
+\begin{latin}\begin{verbatim}
+\SecondSupervisorTitle{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• وابستگی سازمانی:
+\begin{latin}\begin{verbatim}
+\SecondSupervisorAffiliation{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\SecondSupervisorID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\SecondSupervisorEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
+روند ورود اطلاعات برای سایر اعضای کمیته‌ی دفاع مانند استادان مشاور، استادان داور و نماینده‌ی تحصیلات تکمیلی نیز به همین صورت می‌باشد\@.
\subsection{اطلاعات استاد مشاور}
-اطلاعات استاد مشاور را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. \\
-نام کامل استاد مشاور:
-\[ \textrm{ \lr{ \texttt{$\backslash$CosupervisorName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-سمت یا مرتبه‌ی علمی:
-\[ \textrm{ \lr{ \texttt{$\backslash$CosupervisorTitle\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-وابستگی سازمانی:
-\[ \textrm{ \lr{ \texttt{$\backslash$CosupervisorAffiliation\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$CosupervisorID\{\textrm{<national ID number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$CosupervisorEMAIL\{\textrm{<sample@site.com>}\}} } } \]
+اطلاعات استاد مشاور را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. در صفحه‌ی عنوان، به صورت پیش‌فرض قسمت استادان مشاور وجود ندارد؛ در صورت استفاده از فرمان‌های زیر، این قسمت به صفحه عنوان افزوده خواهد شد\@. \بند
+• نام کامل استاد مشاور:
+\begin{latin}\begin{verbatim}
+\CosupervisorName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• سمت یا مرتبه‌ی علمی:
+\begin{latin}\begin{verbatim}
+\CosupervisorTitle{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• وابستگی سازمانی:
+\begin{latin}\begin{verbatim}
+\CosupervisorAffiliation{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\CosupervisorID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\CosupervisorEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
\subsection{اطلاعات استاد مشاور دوم}
-اطلاعات استاد مشاور دوم را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. \\
-نام کامل استاد مشاور دوم:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondCosupervisorName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-سمت یا مرتبه‌ی علمی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondCosupervisorTitle\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-وابستگی سازمانی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondCosupervisorAffiliation\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondCosupervisorID\{\textrm{<national ID number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondCosupervisorEMAIL\{\textrm{<sample@site.com>}\}} } } \]
+اطلاعات استاد مشاور دوم را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. همانند استاد راهنما دوم، با وارد کردن اطلاعات استاد مشاور دوم، عبارت \موکد{استاد مشاور} درج شده در صفحه عنوان به \موکد{استادان مشاور} تغییر می‌کند\@. \بند
+• نام کامل استاد مشاور دوم:
+\begin{latin}\begin{verbatim}
+\SecondCosupervisorName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• سمت یا مرتبه‌ی علمی:
+\begin{latin}\begin{verbatim}
+\SecondCosupervisorTitle{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• وابستگی سازمانی:
+\begin{latin}\begin{verbatim}
+\SecondCosupervisorAffiliation{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\SecondCosupervisorID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\SecondCosupervisorEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
\subsection{اطلاعات استاد داور اول}
-اطلاعات استاد داور اول را با فرمان‌های زیر وارد کنید\@. \\
-نام کامل استاد داور اول:
-\[ \textrm{ \lr{ \texttt{$\backslash$FirstExaminerName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-سمت یا مرتبه‌ی علمی:
-\[ \textrm{ \lr{ \texttt{$\backslash$FirstExaminerTitle\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-وابستگی سازمانی:
-\[ \textrm{ \lr{ \texttt{$\backslash$FirstExaminerAffiliation\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$FirstExaminerID\{\textrm{<national ID number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$FirstExaminerEMAIL\{\textrm{<sample@site.com>}\}} } } \]
+اطلاعات استاد داور اول را با فرمان‌های زیر وارد کنید\@. \بند
+• نام کامل استاد داور اول:
+\begin{latin}\begin{verbatim}
+\FirstExaminerName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• سمت یا مرتبه‌ی علمی:
+\begin{latin}\begin{verbatim}
+\FirstExaminerTitle{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• وابستگی سازمانی:
+\begin{latin}\begin{verbatim}
+\FirstExaminerAffiliation{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\FirstExaminerID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\FirstExaminerEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
\subsection{اطلاعات استاد داور دوم}
-اطلاعات استاد داور دوم را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. \\
-نام کامل استاد داور دوم:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondExaminerName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-سمت یا مرتبه‌ی علمی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondExaminerTitle\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-وابستگی سازمانی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondExaminerAffiliation\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondExaminerID\{\textrm{<national ID number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$SecondExaminerEMAIL\{\textrm{<sample@site.com>}\}} } } \]
+اطلاعات استاد داور دوم را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. \بند
+• نام کامل استاد داور دوم:
+\begin{latin}\begin{verbatim}
+\SecondExaminerName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• سمت یا مرتبه‌ی علمی:
+\begin{latin}\begin{verbatim}
+\SecondExaminerTitle{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• وابستگی سازمانی:
+\begin{latin}\begin{verbatim}
+\SecondExaminerAffiliation{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\SecondExaminerID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\SecondExaminerEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
\subsection{اطلاعات استاد داور سوم}
-اطلاعات استاد داور سوم را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. \\
-نام کامل استاد داور سوم:
-\[ \textrm{ \lr{ \texttt{$\backslash$ThirdExaminerName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-سمت یا مرتبه‌ی علمی:
-\[ \textrm{ \lr{ \texttt{$\backslash$ThirdExaminerTitle\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-وابستگی سازمانی:
-\[ \textrm{ \lr{ \texttt{$\backslash$ThirdExaminerAffiliation\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$ThirdExaminerID\{\textrm{<national ID number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$ThirdExaminerEMAIL\{\textrm{<sample@site.com>}\}} } } \]
+اطلاعات استاد داور سوم را -در صورت وجود- با فرمان‌های زیر وارد کنید\@. \بند
+• نام کامل استاد داور سوم:
+\begin{latin}\begin{verbatim}
+\ThirdExaminerName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• سمت یا مرتبه‌ی علمی:
+\begin{latin}\begin{verbatim}
+\ThirdExaminerTitle{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• وابستگی سازمانی:
+\begin{latin}\begin{verbatim}
+\ThirdExaminerAffiliation{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\ThirdExaminerID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\ThirdExaminerEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+
\subsection{اطلاعات نماینده‌ی تحصیلات تکمیلی}
-اطلاعات نماینده‌ی تحصیلات تکمیلی را با فرمان‌های زیر وارد کنید\@. \\
-نام کامل نماینده‌ی تحصیلات تکمیلی:
-\[ \textrm{ \lr{ \texttt{$\backslash$RepresentativeName\{\textrm{<persian>}\}\{\textrm{<latin>}\}} } } \]
-شماره ملی:
-\[ \textrm{ \lr{ \texttt{$\backslash$RepresentativeID\{\textrm{<national ID number>}\}} } } \]
-رایانامه:
-\[ \textrm{ \lr{ \texttt{$\backslash$RepresentativeEMAIL\{\textrm{<sample@site.com>}\}} } } \]
-\section{ساخت فرم‌ها}
-پس از تکمیل اطلاعت لازم، با استفاده از فرمان‌های گفته‌شده، کار اصلی بسته‌ی پارسا آغاز می‌گردد\@. برای ساخت فرم‌های مدنظر، از دستورات زیر استفاده کنید.\\
+اطلاعات نماینده‌ی تحصیلات تکمیلی را با فرمان‌های زیر وارد کنید\@. \بند
+• نام کامل نماینده‌ی تحصیلات تکمیلی:
+\begin{latin}\begin{verbatim}
+\RepresentativeName{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• شماره ملی:
+\begin{latin}\begin{verbatim}
+\RepresentativeID{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+• رایانامه:
+\begin{latin}\begin{verbatim}
+\RepresentativeEMAIL{<persian>}{<latin>}
+\end{verbatim} \end{latin}
+\section{ساخت فرم‌ها}
+پس از تکمیل اطلاعت لازم، با استفاده از فرمان‌های گفته‌شده، کار اصلی بسته‌ی پارسا آغاز می‌گردد\@. برای ساخت فرم‌های مورد نظرتان، کافی است از فرمان مربوط به ساخت هر فرم در محلی که می‌خواهید درج شود استفاده کنید.\\
\begin{table}[H] \adjustbox{pagecenter}{
\begin{tabular}{lr}
\lr{\texttt{$\backslash$titlepageParsi}} & صفحه‌ی عنوان به فارسی \\
@@ -206,7 +380,7 @@ marginparwidth=0cm, marginparsep=3mm, % Specify the border width and distance fr
\end{table}
توجه کنید که فقط فرمان تقدیم، \textrm{\lr{\texttt{$\backslash$ParsaDedicate}}}~، به آرگومان نیاز دارد\@. متن تقدیم خود را در آرگومان این فرمان بنویسید\@. \بند
-\پاراگراف{}برای نوشتن چکیده‌ی پایان‌نامه یا رساله، به زبان فارسی از محیط \متن‌لاتین{\متن‌تایپ{ParsaAbstractParsi}}~، و برای چکیده به لاتین از محیط \متن‌لاتین{\متن‌تایپ{ParsaAbstractLatin}} استفاده کنید\@. \\
+برای نوشتن چکیده‌ی پایان‌نامه یا رساله، به زبان فارسی از محیط \متن‌لاتین{\متن‌تایپ{ParsaAbstractParsi}}~، و برای چکیده به لاتین از محیط \متن‌لاتین{\متن‌تایپ{ParsaAbstractLatin}} استفاده کنید\@. \بند
\begin{latin}
\begin{minipage}{0.48\textwidth}
\begin{verbatim}
@@ -223,20 +397,17 @@ marginparwidth=0cm, marginparsep=3mm, % Specify the border width and distance fr
\end{verbatim}
\end{minipage}
\end{latin}
-~\بند
+\vspace{10mm}
برای نوشتن متن سپاس‌گزاری از محیط \متن‌لاتین{\متن‌تایپ{ParsaAcknowledgment}} ~استفاده کنید.\\
-\begin{latin}
-\begin{verbatim}
+\begin{latin} \begin{verbatim}
\begin{ParsaAcknowledgment}
\end{ParsaAcknowledgment}
-\end{verbatim}
-\end{latin}
+\end{verbatim} \end{latin}
\section{کدهای آماده}
کدهای زیر برای استفاده در \LaTeX ~برای شما آماده شده‌است. برای استفاده از هر کد، کافی‌است علامت درصد ابتدای هرخط را حذف کنید.
-\begin{latin}
-\begin{verbatim}
+\begin{latin} \begin{verbatim}
\documentclass[a4paper,12pt,twoside]{book}
\usepackage{parsa}
@@ -324,80 +495,86 @@ marginparwidth=0cm, marginparsep=3mm, % Specify the border width and distance fr
%------------------------------------------------------------------
\begin{document}
+%------------------------------------------------------------------
+% FRONT MATTER
+%------------------------------------------------------------------
+
+%\frontmatter
+\pagestyle{empty}
\titlepageParsi
-\newpage
+\cleardoublepage
-%-----------------------------------------------
-% PERSIAN ABSTRACT STARTS FROM HERE:
-%
+% --- Persian Abstract
\begin{ParsaAbstractParsi}
\end{ParsaAbstractParsi}
-%
-% PERSIAN ABSTRACT ENDED.
-%-----------------------------------------------
+\newpage
-\ParsaPicture{}
+\ParsaPicture{picture}
+\cleardoublepage
\ParsaCredit
-\newpage
+\cleardoublepage
\ExaminationReportPa
-\newpage
+\cleardoublepage
\ParsaCopyleft
-\newpage
+\cleardoublepage
\ParsaDedicate{}
+% --- Persian Acknowledgment
+\begin{ParsaAcknowledgment}
+\end{ParsaAcknowledgment}
+\cleardoublepage
+% --- Tables of Contents
+\tableofcontents \cleardoublepage
-%--------------------------------------------------
-% ACKNOWLEDGMENT STARTS FROM HERE:
-%
-\begin{ParsaAcknowledgment}
+\listoffigures \cleardoublepage
-\end{ParsaAcknowledgment}
-%
-% ACKNOWLEDGEMENT ENDED.
-%--------------------------------------------------
-\newpage
+\listoftables \cleardoublepage
-%--------------------------------------------------
-% CV STARTS FROM HERE:
-%
+%------------------------------------------------------------------
+% MAIN MATTER
+%------------------------------------------------------------------
+
+%\mainmatter
+\pagestyle{headings}
+
+
+
+
+%------------------------------------------------------------------
+% BACK MATTER
+%------------------------------------------------------------------
+
+%\backmatter
+\pagestyle{empty}
+
+\cleardoublepage
+% --- Persian CV
\begin{ParsaCV}
\end{ParsaCV}
-%
-% CV ENDED.
-%--------------------------------------------------
-
+\cleardoublepage
+~\newpage
\ExaminationReportLa
-\newpage
+\cleardoublepage
-%-----------------------------------------------
-% LATIN ABSTRACT STARTS FROM HERE:
-%
+% --- Latin Abstract
\begin{ParsaAbstractLatin}
\end{ParsaAbstractLatin}
-%
-% LATIN ABSTRACT ENDED.
-%-----------------------------------------------
+~\newpage
\titlepageLatin
\end{document}
-\end{verbatim}
-\end{latin}
-
-\section{نمونه پایان‌نامه}
-در صفحات بعدی، نمونه‌ای از پایان نامه‌ی انجام‌شده به کمک بسته‌ی پارسا قرار گرفته‌است. \\
-\cleardoublepage
+\end{verbatim} \end{latin}
-\includepdf[page=-]{minimaltemplate}
\end{document}
diff --git a/macros/xetex/latex/parsa/parsa.sty b/macros/xetex/latex/parsa/parsa.sty
index 9b4ca1f7ed..2f09946929 100644
--- a/macros/xetex/latex/parsa/parsa.sty
+++ b/macros/xetex/latex/parsa/parsa.sty
@@ -2,7 +2,7 @@
%% This is file `parsa.sty',
%%
%% __________________________________________________
-%% Copyright (c) 2019 Farshad Rasuli
+%% Copyright (c) 2019-2020 Farshad Rasuli
%%
%% It may be distributed and/or modified under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
@@ -23,8 +23,8 @@
% --- Package structure: Identification
\NeedsTeXFormat{LaTeX2e}
-\def\parsa@version{1.1}
-\def\parsadate{2019/12/14}
+\def\parsa@version{1.2}
+\def\parsadate{2020/3/6}
\def\parsafirstrelease{2019/12/12}
\ProvidesPackage{parsa}[\parsadate\space v\parsa@version\space
A XeLaTeX package for theses and dissertations at Iranian Universities as fast and as efficiently as possible]
@@ -35,7 +35,7 @@ A XeLaTeX package for theses and dissertations at Iranian Universities as fast a
* Description: The package designed for^^J%
* thesis/dissertation typography.^^J%
* ^^J%
-* Copyright (c) 2019 Farshad Rasuli^^J%
+* Copyright (c) 2019-2020 Farshad Rasuli^^J%
* ^^J%
* v\parsa@version, \parsadate^^J%
* ^^J%
@@ -150,7 +150,8 @@ for Doctoral degree}%
\newcommand{\Supervisoremail}{~}
\newcommand{\captiontwoPa}{~} \newcommand{\captiontwoLa}{~}
\newcommand{\SupervisorReportPa}{~} \newcommand{\SupervisorReportLa}{~}
-\NewDocumentCommand{\SupervisorName}{m m}{\renewcommand{\SupervisorNamePa}{#1}\renewcommand{\SupervisorNameLa}{#2}\renewcommand{\captiontwoPa}{استاد راهنما}\renewcommand{\captiontwoLa}{Supervisor}}\renewcommand{\SupervisorReportPa}{\noindent نام کامل استاد راهنما: ~\textbf{\SupervisorNamePa} \hrulefill \\
+\newcommand{\SupervisorVspace}{~}
+\NewDocumentCommand{\SupervisorName}{m m}{\renewcommand{\SupervisorNamePa}{#1}\renewcommand{\SupervisorNameLa}{#2}\renewcommand{\captiontwoPa}{استاد راهنما}\renewcommand{\captiontwoLa}{Supervisor}\renewcommand{\SupervisorReportPa}{\noindent نام کامل استاد راهنما: ~\textbf{\SupervisorNamePa} \hrulefill \\
\begin{minipage}{0.45\textwidth}
\begin{tabbing}
\textit{مرتبه‌ی علمی} \hspace{1cm} \= \textbf{\SupervisorTitlePa} \\
@@ -185,7 +186,7 @@ for Doctoral degree}%
\begin{center}
Signature
\end{center}
-\end{minipage}}
+\end{minipage}}\renewcommand{\SupervisorVspace}{~\\[2mm]}}
\NewDocumentCommand{\SupervisorTitle}{m m}{\renewcommand{\SupervisorTitlePa}{#1}\renewcommand{\SupervisorTitleLa}{#2}}
@@ -201,6 +202,7 @@ Signature
\newcommand{\SecondSupervisorid}{~}
\newcommand{\SecondSupervisoremail}{~}
\newcommand{\SecondSupervisorReportPa}{~} \newcommand{\SecondSupervisorReportLa}{~}
+\newcommand{\SecondSupervisorVspace}{~}
\NewDocumentCommand{\SecondSupervisorName}{m m}{\renewcommand{\SecondSupervisorNamePa}{#1}\renewcommand{\SecondSupervisorNameLa}{#2}\renewcommand{\captiontwoPa}{استادان راهنما}\renewcommand{\captiontwoLa}{Supervisors}\renewcommand{\SecondSupervisorReportPa}{\noindent نام کامل استاد راهنمای دوم: ~\textbf{\SecondSupervisorNamePa} \hrulefill \\
\begin{minipage}{0.45\textwidth}
\begin{tabbing}
@@ -219,7 +221,7 @@ Signature
امضا
\end{center}
\end{minipage}
-}\renewcommand{\SecondSupervisorReportLa}{\noindent 2nd Supervisor:~\textbf{\SecondSupervisorNameLa} \hrulefill \\
+}\renewcommand{\SecondSupervisorReportLa}{\noindent Second Supervisor:~\textbf{\SecondSupervisorNameLa} \hrulefill \\
\begin{minipage}{0.4\textwidth}
\begin{tabbing}
\textit{Title} \hspace{0.85cm} \= \textbf{\SecondSupervisorTitleLa} \\
@@ -236,7 +238,7 @@ Signature
\begin{center}
Signature
\end{center}
-\end{minipage}}}
+\end{minipage}}\renewcommand{\SecondSupervisorVspace}{~\\[2mm]}}
\NewDocumentCommand{\SecondSupervisorTitle}{m m}{\renewcommand{\SecondSupervisorTitlePa}{#1}\renewcommand{\SecondSupervisorTitleLa}{#2}}
@@ -253,6 +255,7 @@ Signature
\newcommand{\Cosupervisoremail}{~}
\newcommand{\captionthreePa}{~} \newcommand{\captionthreeLa}{~}
\newcommand{\CosupervisorReportPa}{~} \newcommand{\CosupervisorReportLa}{~}
+\newcommand{\CosupervisorVspace}{~}
\NewDocumentCommand{\CosupervisorName}{m m}{\renewcommand{\CosupervisorNamePa}{#1}\renewcommand{\CosupervisorNameLa}{#2}\renewcommand{\captionthreePa}{استاد مشاور}\renewcommand{\captionthreeLa}{Co-supervisor}\renewcommand{\CosupervisorReportPa}{\noindent نام کامل استاد مشاور: ~\textbf{\CosupervisorNamePa} \hrulefill \\
\begin{minipage}{0.45\textwidth}
\begin{tabbing}
@@ -288,7 +291,7 @@ Signature
\begin{center}
Signature
\end{center}
-\end{minipage}}}
+\end{minipage}}\renewcommand{\CosupervisorVspace}{~\\[2mm]}}
\NewDocumentCommand{\CosupervisorTitle}{m m}{\renewcommand{\CosupervisorTitlePa}{#1}\renewcommand{\CosupervisorTitleLa}{#2}}
@@ -304,6 +307,7 @@ Signature
\newcommand{\SecondCosupervisorid}{~}
\newcommand{\SecondCosupervisoremail}{~}
\newcommand{\SecondCosupervisorReportPa}{~} \newcommand{\SecondCosupervisorReportLa}{~}
+\newcommand{\SecondCosupervisorVspace}{~}
\NewDocumentCommand{\SecondCosupervisorName}{m m}{\renewcommand{\SecondCosupervisorNamePa}{#1}\renewcommand{\SecondCosupervisorNameLa}{#2}\renewcommand{\captionthreePa}{استادان مشاور}\renewcommand{\captionthreeLa}{Co-supervisors}\renewcommand{\SecondCosupervisorReportPa}{\noindent نام کامل استاد مشاور دوم: ~\textbf{\SecondCosupervisorNamePa} \hrulefill \\
\begin{minipage}{0.45\textwidth}
\begin{tabbing}
@@ -322,7 +326,7 @@ Signature
امضا
\end{center}
\end{minipage}
-}\renewcommand{\SecondCosupervisorReportLa}{\noindent 2nd Co-supervisor:~\textbf{\SecondCosupervisorNameLa} \hrulefill \\
+}\renewcommand{\SecondCosupervisorReportLa}{\noindent Second Co-supervisor:~\textbf{\SecondCosupervisorNameLa} \hrulefill \\
\begin{minipage}{0.4\textwidth}
\begin{tabbing}
\textit{Title} \hspace{0.85cm} \= \textbf{\SecondCosupervisorTitleLa} \\
@@ -339,7 +343,7 @@ Signature
\begin{center}
Signature
\end{center}
-\end{minipage}}}
+\end{minipage}}\renewcommand{\SecondCosupervisorVspace}{~\\[2mm]}}
\NewDocumentCommand{\SecondCosupervisorTitle}{m m}{\renewcommand{\SecondCosupervisorTitlePa}{#1}\renewcommand{\SecondCosupervisorTitleLa}{#2}}
@@ -355,6 +359,7 @@ Signature
\newcommand{\FirstExaminerid}{~}
\newcommand{\FirstExamineremail}{~}
\newcommand{\FirstExaminerReportPa}{~} \newcommand{\FirstExaminerReportLa}{~}
+\newcommand{\FirstExaminerVspace}{~}
\NewDocumentCommand{\FirstExaminerName}{m m}{\renewcommand{\FirstExaminerNamePa}{#1}\renewcommand{\FirstExaminerNameLa}{#2}\renewcommand{\FirstExaminerReportPa}{\noindent نام کامل استاد داور اول: ~\textbf{\FirstExaminerNamePa} \hrulefill \\
\begin{minipage}{0.45\textwidth}
\begin{tabbing}
@@ -373,7 +378,7 @@ Signature
امضا
\end{center}
\end{minipage}
-}\renewcommand{\FirstExaminerReportLa}{\noindent 1st Examiner:~\textbf{\FirstExaminerNameLa} \hrulefill \\
+}\renewcommand{\FirstExaminerReportLa}{\noindent First Examiner:~\textbf{\FirstExaminerNameLa} \hrulefill \\
\begin{minipage}{0.4\textwidth}
\begin{tabbing}
\textit{Title} \hspace{0.85cm} \= \textbf{\FirstExaminerTitleLa} \\
@@ -390,7 +395,7 @@ Signature
\begin{center}
Signature
\end{center}
-\end{minipage}}}
+\end{minipage}}\renewcommand{\FirstExaminerVspace}{~\\[2mm]}}
\NewDocumentCommand{\FirstExaminerTitle}{m m}{\renewcommand{\FirstExaminerTitlePa}{#1}\renewcommand{\FirstExaminerTitleLa}{#2}}
@@ -406,6 +411,7 @@ Signature
\newcommand{\SecondExaminerid}{~}
\newcommand{\SecondExamineremail}{~}
\newcommand{\SecondExaminerReportPa}{~} \newcommand{\SecondExaminerReportLa}{~}
+\newcommand{\SecondExaminerVspace}{~}
\NewDocumentCommand{\SecondExaminerName}{m m}{\renewcommand{\SecondExaminerNamePa}{#1}\renewcommand{\SecondExaminerNameLa}{#2}\renewcommand{\SecondExaminerReportPa}{\noindent نام کامل استاد داور دوم: ~\textbf{\SecondExaminerNamePa} \hrulefill \\
\begin{minipage}{0.45\textwidth}
\begin{tabbing}
@@ -424,7 +430,7 @@ Signature
امضا
\end{center}
\end{minipage}
-}\renewcommand{\SecondExaminerReportLa}{\noindent 2nd Examiner:~\textbf{\SecondExaminerNameLa} \hrulefill \\
+}\renewcommand{\SecondExaminerReportLa}{\noindent Second Examiner:~\textbf{\SecondExaminerNameLa} \hrulefill \\
\begin{minipage}{0.4\textwidth}
\begin{tabbing}
\textit{Title} \hspace{0.85cm} \= \textbf{\SecondExaminerTitleLa} \\
@@ -441,7 +447,7 @@ Signature
\begin{center}
Signature
\end{center}
-\end{minipage}}}
+\end{minipage}}\renewcommand{\SecondExaminerVspace}{~\\[2mm]}}
\NewDocumentCommand{\SecondExaminerTitle}{m m}{\renewcommand{\SecondExaminerTitlePa}{#1}\renewcommand{\SecondExaminerTitleLa}{#2}}
@@ -457,6 +463,7 @@ Signature
\newcommand{\ThirdExaminerid}{~}
\newcommand{\ThirdExamineremail}{~}
\newcommand{\ThirdExaminerReportPa}{~} \newcommand{\ThirdExaminerReportLa}{~}
+\newcommand{\ThirdExaminerVspace}{~}
\NewDocumentCommand{\ThirdExaminerName}{m m}{\renewcommand{\ThirdExaminerNamePa}{#1}\renewcommand{\ThirdExaminerNameLa}{#2}\renewcommand{\ThirdExaminerReportPa}{\noindent نام کامل استاد داور سوم: ~\textbf{\ThirdExaminerNamePa} \hrulefill \\
\begin{minipage}{0.45\textwidth}
\begin{tabbing}
@@ -475,7 +482,7 @@ Signature
امضا
\end{center}
\end{minipage}
-}\renewcommand{\ThirdExaminerReportLa}{\noindent 3rd Examiner:~\textbf{\ThirdExaminerNameLa} \hrulefill \\
+}\renewcommand{\ThirdExaminerReportLa}{\noindent Third Examiner:~\textbf{\ThirdExaminerNameLa} \hrulefill \\
\begin{minipage}{0.4\textwidth}
\begin{tabbing}
\textit{Title} \hspace{0.85cm} \= \textbf{\ThirdExaminerTitleLa} \\
@@ -492,7 +499,7 @@ Signature
\begin{center}
Signature
\end{center}
-\end{minipage}}}
+\end{minipage}}\renewcommand{\ThirdExaminerVspace}{~\\[2mm]}}
\NewDocumentCommand{\ThirdExaminerTitle}{m m}{\renewcommand{\ThirdExaminerTitlePa}{#1}\renewcommand{\ThirdExaminerTitleLa}{#2}}
@@ -506,6 +513,7 @@ Signature
\newcommand{\Representativeid}{~}
\newcommand{\Representativeemail}{~}
\newcommand{\RepresentativeReportPa}{~} \newcommand{\RepresentativeReportLa}{~}
+\newcommand{\RepresentativeVspace}{~}
\NewDocumentCommand{\RepresentativeName}{m m}{\renewcommand{\RepresentativeNamePa}{#1}\renewcommand{\RepresentativeNameLa}{#2}\renewcommand{\RepresentativeReportPa}{\noindent نماینده‌ی تحصیلات تکمیلی \hrulefill \\[0.25cm]
\begin{minipage}{0.8\textwidth}
\begin{tabbing}
@@ -531,7 +539,7 @@ Signature
\begin{center}
Signature
\end{center}
-\end{minipage}}}
+\end{minipage}}\renewcommand{\RepresentativeVspace}{~\\[2mm]}}
\NewDocumentCommand{\RepresentativeTitle}{m m}{\renewcommand{\RepresentativeTitlePa}{#1}\renewcommand{\RepresentativeTitleLa}{#2}}
@@ -629,7 +637,7 @@ Signature
\end{tabular} }
\end{table}
\begin{minipage}{1\textwidth}
-\begin{flushright} \begin{tabular}{p{0.16\textwidth}p{0.79\textwidth}}
+\begin{flushright} \begin{tabular}{p{0.2\textwidth}p{0.75\textwidth}}
\textit{نام کامل دانش‌آموخته} & \textbf{\StudentNamePa} \\
\textit{رشته‌ی تحصیلی} & \StudentMajorPa ~\StudentMinorPa \\
\textit{شماره ملی} & \Studentid \\
@@ -641,14 +649,14 @@ Signature
و با درجه‌ی عالی $\bigcirc$ بسیار خوب $\bigcirc$ خوب $\bigcirc$ پذیرفته‌نشده $\bigcirc$ ارزیابی کرد.
} \end{center} \end{minipage} ~\\
-\SupervisorReportPa ~\\[0.2cm]
-\SecondSupervisorReportPa ~\\[0.2cm]
-\CosupervisorReportPa ~\\[0.2cm]
-\SecondCosupervisorReportPa ~\\[0.2cm]
-\FirstExaminerReportPa ~\\[0.2cm]
-\SecondExaminerReportPa ~\\[0.2cm]
-\ThirdExaminerReportPa ~\\[0.2cm]
-\RepresentativeReportPa}
+\SupervisorReportPa \SupervisorVspace
+\SecondSupervisorReportPa \SecondSupervisorVspace
+\CosupervisorReportPa \CosupervisorVspace
+\SecondCosupervisorReportPa \SecondCosupervisorVspace
+\FirstExaminerReportPa \FirstExaminerVspace
+\SecondExaminerReportPa \SecondExaminerVspace
+\ThirdExaminerReportPa \ThirdExaminerVspace
+\RepresentativeReportPa \RepresentativeVspace}
\NewDocumentCommand{\ExaminationReportLa}{}{\begin{latin}
\begin{table}[H] \adjustbox{pagecenter}{
@@ -670,22 +678,23 @@ Signature
Following the oral defence by the student, the examination committee evaluated the \ParsaTypeLa ~as:\\
Excellent $\bigcirc$ Very Good $\bigcirc$ Good $\bigcirc$ Not Acceptable $\bigcirc$\@.
} \end{center} \end{minipage} ~\\
-\SupervisorReportLa ~\\[0.2cm]
-\SecondSupervisorReportLa ~\\[0.2cm]
-\CosupervisorReportLa ~\\[0.2cm]
-\SecondCosupervisorReportLa ~\\[0.2cm]
-\FirstExaminerReportLa ~\\[0.2cm]
-\SecondExaminerReportLa ~\\[0.2cm]
-\ThirdExaminerReportLa ~\\[0.2cm]
-\RepresentativeReportLa \end{latin}}
-
-\NewDocumentCommand{\ParsaCopyleft}{}{\begin{center} \begin{minipage}{0.67\textwidth}
+
+\SupervisorReportLa \SupervisorVspace
+\SecondSupervisorReportLa \SecondSupervisorVspace
+\CosupervisorReportLa \CosupervisorVspace
+\SecondCosupervisorReportLa \SecondCosupervisorVspace
+\FirstExaminerReportLa \FirstExaminerVspace
+\SecondExaminerReportLa \SecondExaminerVspace
+\ThirdExaminerReportLa \ThirdExaminerVspace
+\RepresentativeReportLa \RepresentativeVspace \end{latin}}
+
+\NewDocumentCommand{\ParsaCopyleft}{}{\begin{center} \begin{minipage}{0.8\textwidth}
\section*{\centering مجوز بهره‌برداری}
بهره‌برداری از این \ParsaTypePa ~در چهارچوب مقررات کتاب‌خانه و با توجه به محدودیتی که توسط استاد راهنما به شرح زیر تعیین می‌گردد، بلامانع است:\\
\begin{itemize}
\item[$\bigcirc$] بهره‌برداری از این \ParsaTypePa ~برای همگان و با ذکر منبع، بلامانع است.
\item[$\bigcirc$] بهره‌برداری از این \ParsaTypePa ~با اخذ مجوز از استاد راهنما و با ذکر منبع، بلامانع است.
-\item[$\bigcirc$] بهره‌برداری از این \ParsaTypePa ~تا تاریخ \hspace{4cm} ممنوع است.
+\item[$\bigcirc$] بهره‌برداری از این \ParsaTypePa ~تا تاریخ \hspace{35mm} ممنوع است.
\end{itemize}
\begin{center}
استاد راهنما: \SupervisorNamePa \\
diff --git a/macros/xetex/latex/parsa/picture.jpg b/macros/xetex/latex/parsa/picture.jpg
deleted file mode 100644
index 203a68fc7c..0000000000
--- a/macros/xetex/latex/parsa/picture.jpg
+++ /dev/null
Binary files differ